diff --git a/cfg/per-class/classF.cfg b/cfg/per-class/classF.cfg
index d050f3d77d4c24576384d7bcb18bd10cf4a8ace7..1c6d0ccceeb2061ce04fd1cacc72c3daecd4ba68 100644
--- a/cfg/per-class/classF.cfg
+++ b/cfg/per-class/classF.cfg
@@ -19,3 +19,4 @@ IBCBiPred:       0
 IBCNonAdjCand:      1
 IBCFilter:       1
 ItmpLicExtension:   1
+InterSliceSeparateTree:   0
\ No newline at end of file
diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index 4731ad4335c39e2d288b5c88ee70b2286c220327..986e8b933b6d3116eaaacb6f891236257bc21721 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -49,9 +49,7 @@
 
 
 #if JVET_AI0136_ADAPTIVE_DUAL_TREE
-Partitioner *g_encPartitionerSST=nullptr;
-#else
-Partitioner* g_encPartitionerSST;
+static Partitioner *g_encPartitionerSST=nullptr;
 #endif
 
 //! \ingroup EncoderLib