diff --git a/src/encoder.c b/src/encoder.c
index 84416936..82eb2d36 100644
--- a/src/encoder.c
+++ b/src/encoder.c
@@ -646,7 +646,7 @@ void encode_seq_parameter_set(encoder_control* encoder)
   WRITE_U(encoder->stream, 0, 1, "long_term_ref_pics_present_flag");
   //IF long_term_ref_pics_present
   //ENDIF
-  WRITE_U(encoder->stream, 0, 1, "sps_temporal_mvp_enable_flag");
+  WRITE_U(encoder->stream, ENABLE_TEMPORAL_MVP, 1, "sps_temporal_mvp_enable_flag");
 
   WRITE_U(encoder->stream, 0, 1, "sps_strong_intra_smoothing_enable_flag");
 
@@ -823,7 +823,7 @@ void encode_slice_data(encoder_control* encoder)
 void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, uint8_t depth)
 { 
   CU_info *cur_CU = &encoder->in.cur_pic->CU[depth][xCtb+yCtb*(encoder->in.width_in_LCU<<MAX_DEPTH)];
-  uint8_t split_flag = cur_CU->split;//(depth<1)?1:0; /* TODO: get from CU data */
+  uint8_t split_flag = cur_CU->split;
   uint8_t split_model = 0;
 
   /* Check for slice border */
diff --git a/src/global.h b/src/global.h
index 194a515b..c0bf7a7d 100644
--- a/src/global.h
+++ b/src/global.h
@@ -27,6 +27,8 @@
 #define ENABLE_SIGN_HIDING 0 /*!< DOES NOT WORK PROPERLY */
 #define ENABLE_SCALING_LIST 1 /*!< Enable usage of (default) scaling list (BREAKS CHROMA WHEN 0!) */
 
+#define ENABLE_TEMPORAL_MVP 0 /*!< Enable usage of temporal Motion Vector Prediction */
+
 /* END OF CONFIG VARIABLES */
 
 #define MAX_REF_PIC_COUNT 5
diff --git a/src/inter.c b/src/inter.c
index e2582c91..228d8e0a 100644
--- a/src/inter.c
+++ b/src/inter.c
@@ -165,12 +165,11 @@ void inter_recon(picture* ref,int32_t xpos, int32_t ypos,int32_t width, int16_t
 void inter_get_mv_cand(encoder_control *encoder,int32_t xCtb, int32_t yCtb,int8_t depth, int16_t mv_cand[2][2])
 {
   uint8_t cur_block_in_scu = (LCU_WIDTH>>depth) / CU_MIN_SIZE_PIXELS;
-  CU_info *cur_cu = &encoder->in.cur_pic->CU[depth][xCtb+yCtb*(encoder->in.width_in_LCU<<MAX_DEPTH)];
   uint8_t candidates = 0;
 
   /*
   Predictor block locations
-  ____      ______
+  ____      _______
   |B2|______|B1|B0|
      |         |
      |  Cur CU |
@@ -230,11 +229,18 @@ void inter_get_mv_cand(encoder_control *encoder,int32_t xCtb, int32_t yCtb,int8_
     candidates++;
   }
 
+  /* Remove identical candidate */
+  if(candidates == 2 && mv_cand[0][0] == mv_cand[1][0] && mv_cand[0][1] == mv_cand[1][1]) {
+    candidates = 1;
+  }
+
+#if ENABLE_TEMPORAL_MVP
   if(candidates < 2) {
     //TODO: add temporal mv predictor
   }
+#endif
 
-  for (;candidates < 2; candidates++) {
+  while (candidates < 2) {
     mv_cand[candidates][0] = 0;
     mv_cand[candidates][1] = 0;
     candidates++;