diff --git a/source/Lib/CommonLib/ContextModelling.cpp b/source/Lib/CommonLib/ContextModelling.cpp
index d2670f3b1a8509cac94ab0b819c13c8b32e8f9a3..124c8141af24980b1bc5e481e8202f95ddea0f94 100644
--- a/source/Lib/CommonLib/ContextModelling.cpp
+++ b/source/Lib/CommonLib/ContextModelling.cpp
@@ -284,8 +284,8 @@ void DeriveCtx::CtxSplit( const CodingStructure& cs, Partitioner& partitioner, u
   //////////////////////////
   // CTX is h/v bt (0-3)
   //////////////////////////
-  ctxHorBt = ( partitioner.currBtDepth >= 2 ? 1 : 0 );
-  ctxVerBt = ( partitioner.currBtDepth >= 2 ? 3 : 2 );
+  ctxHorBt = ( partitioner.currMtDepth <= 1 ? 1 : 0 );
+  ctxVerBt = ( partitioner.currMtDepth <= 1 ? 3 : 2 );
 }
 #else
 unsigned DeriveCtx::CtxCUsplit( const CodingStructure& cs, Partitioner& partitioner )
diff --git a/source/Lib/CommonLib/Contexts.cpp b/source/Lib/CommonLib/Contexts.cpp
index 85ad6159688dab89b2028f9924d7c0d82372a123..ab3c134d37c3e995392dac2497a959a3098e2e68 100644
--- a/source/Lib/CommonLib/Contexts.cpp
+++ b/source/Lib/CommonLib/Contexts.cpp
@@ -394,9 +394,9 @@ const CtxSet ContextSetCfg::SplitHvFlag = ContextSetCfg::addCtxSet
 
 const CtxSet ContextSetCfg::Split12Flag = ContextSetCfg::addCtxSet
 ({
-  { 140, 154, 140, 154, },
-  { 155, 169, 140, 154, },
-  { 155, 154, 155, 154, },
+  { 154, 140, 154, 140, },
+  { 169, 155, 154, 140, },
+  { 154, 155, 154, 155, },
 #if JVET_M0453_CABAC_ENGINE
   { DWS, DWS, DWS, DWS, },
 #endif