diff --git a/source/Lib/CommonLib/MotionInfo.h b/source/Lib/CommonLib/MotionInfo.h
index 26fcb5a712797ddf09b3b2b262617542e8c8269d..b46628e1b86f1767ef7828c14aa7f3c9acfbc99e 100644
--- a/source/Lib/CommonLib/MotionInfo.h
+++ b/source/Lib/CommonLib/MotionInfo.h
@@ -162,7 +162,7 @@ public:
     }
 
     Mv* pAffineMv = &(m_mvAffine[0][0][0][0]);
-    for (int ui = 0; ui < 2 * 2 * 33 * 3; ++ui, ++pMv)
+    for (int ui = 0; ui < 2 * 2 * 33 * 3; ++ui, ++pAffineMv)
     {
       pAffineMv->set(0, 0);
     }
diff --git a/source/Lib/CommonLib/Unit.cpp b/source/Lib/CommonLib/Unit.cpp
index 6152c93f57b58f37865eb29ad338f314b8b6babd..3c21d11bcce7c067ba06c957b8eaa08bc5b18272 100644
--- a/source/Lib/CommonLib/Unit.cpp
+++ b/source/Lib/CommonLib/Unit.cpp
@@ -268,6 +268,8 @@ CodingUnit& CodingUnit::operator=( const CodingUnit& other )
   imvNumCand        = other.imvNumCand;
 #if JVET_L0646_GBI
   GBiIdx            = other.GBiIdx;
+  for (int i = 0; i<2; i++)
+    refIdxBi[i] = other.refIdxBi[i];
 #endif
   return *this;
 }
@@ -297,6 +299,8 @@ void CodingUnit::initData()
   imvNumCand        = 0;
 #if JVET_L0646_GBI
   GBiIdx            = GBI_DEFAULT;
+  for (int i = 0; i < 2; i++)
+    refIdxBi[i] = -1;
 #endif
 }