diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index 69f569bb0f5f6840c5a55df1d8a83029e120cfe8..4287aefee2a00ecd745edd7ba24f605e08590b71 100644
--- a/source/Lib/DecoderLib/CABACReader.cpp
+++ b/source/Lib/DecoderLib/CABACReader.cpp
@@ -958,7 +958,9 @@ void CABACReader::cu_gbi_flag(CodingUnit& cu)
     uint32_t prefixNumBits = numGBi - 2;
     uint32_t step = 1;
 
+#if !JVET_N0286_SIMPLIFIED_GBI_IDX
     unsigned ctxIdGBi = 4;
+#endif
     idx = 1;
 
     for(int ui = 0; ui < prefixNumBits; ++ui)
@@ -973,7 +975,9 @@ void CABACReader::cu_gbi_flag(CodingUnit& cu)
       {
         break;
       }
+#if !JVET_N0286_SIMPLIFIED_GBI_IDX
       ctxIdGBi += step;
+#endif
       idx += step;
     }
   }
diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index 8848ba1edd3c3ea642a6af192607e409569a8e52..7652dc03cefb2fdf451ae11aa2121bfbebf983af 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -761,7 +761,9 @@ void CABACWriter::cu_gbi_flag(const CodingUnit& cu)
     const uint32_t prefixNumBits = numGBi - 2;
     const uint32_t step = 1;
 
+#if !JVET_N0286_SIMPLIFIED_GBI_IDX
     int ctxIdGBi = 4;
+#endif
     uint8_t idx = 1;
     for(int ui = 0; ui < prefixNumBits; ++ui)
     {
@@ -780,8 +782,8 @@ void CABACWriter::cu_gbi_flag(const CodingUnit& cu)
         m_BinEncoder.encodeBinEP(0);
 #else
         m_BinEncoder.encodeBin(0, Ctx::GBiIdx(ctxIdGBi));
-#endif
         ctxIdGBi += step;
+#endif
         idx += step;
       }
     }