diff --git a/source/Lib/CommonLib/Contexts.cpp b/source/Lib/CommonLib/Contexts.cpp
index 2385d1a91336b59b45ce6bfa2145528719dd8709..74b50910a5f2dd494c13e20323ed27d1e29d6efe 100644
--- a/source/Lib/CommonLib/Contexts.cpp
+++ b/source/Lib/CommonLib/Contexts.cpp
@@ -1184,9 +1184,9 @@ const CtxSet ContextSetCfg::MultiHypothesisFlag = ContextSetCfg::addCtxSet
   { 3, 26, CNU, },
   { 3, 26, CNU, },
   { 35, 35, CNU, },
-  { 1,  4, CNU, },
-  { 1,  4, CNU, },
-  { 4,  4, CNU, }
+  { 1,  4, DWS, },
+  { 1,  4, DWS, },
+  { 4,  4, DWS, }
 });
 
 const CtxSet ContextSetCfg::MHRefPic = ContextSetCfg::addCtxSet
@@ -1534,6 +1534,8 @@ const CtxSet ContextSetCfg::CcSaoControlIdc = ContextSetCfg::addCtxSet
   { CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU, },
   { CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU, },
   { DWS, DWS, DWS, DWS, DWS, DWS, DWS, DWS, DWS, },
+  { DWS, DWS, DWS, DWS, DWS, DWS, DWS, DWS, DWS, },
+  { DWS, DWS, DWS, DWS, DWS, DWS, DWS, DWS, DWS, },
 });
 #endif