diff --git a/source/Lib/CommonLib/CodingStructure.cpp b/source/Lib/CommonLib/CodingStructure.cpp
index c8fa7d267eeddf9382fee311cf8fd131f22a7e9f..0b8ebbdfaba3ca5779064bbb809ba5ac668c3edc 100644
--- a/source/Lib/CommonLib/CodingStructure.cpp
+++ b/source/Lib/CommonLib/CodingStructure.cpp
@@ -979,7 +979,7 @@ void CodingStructure::initStructData( const int &QP, const bool &_isLosses, cons
   clearTUs();
   clearCUs();
 
-  if( QP >= 0 )
+  if( QP < MAX_INT )
   {
     currQP[0] = currQP[1] = QP;
     isLossless            = _isLosses;
diff --git a/source/Lib/CommonLib/CodingStructure.h b/source/Lib/CommonLib/CodingStructure.h
index e531ecc1aa872b667e6bbe464b8f126968a963c8..ce4209de8f762ad1c5523478b0d7e38318ab94a7 100644
--- a/source/Lib/CommonLib/CodingStructure.h
+++ b/source/Lib/CommonLib/CodingStructure.h
@@ -172,7 +172,7 @@ public:
   Distortion  dist;
   Distortion  interHad;
 
-  void initStructData  (const int &QP = -1, const bool &_isLosses = false, const bool &skipMotBuf = false);
+  void initStructData  (const int &QP = MAX_INT, const bool &_isLosses = false, const bool &skipMotBuf = false);
   void initSubStructure(      CodingStructure& cs, const ChannelType chType, const UnitArea &subArea, const bool &isTuEnc);
 
   void copyStructure   (const CodingStructure& cs, const ChannelType chType, const bool copyTUs = false, const bool copyRecoBuffer = false);
diff --git a/source/Lib/EncoderLib/IntraSearch.cpp b/source/Lib/EncoderLib/IntraSearch.cpp
index e8d76cfb09fe6c18b135eb85820b9db144fa085c..6e93a14f13407e76a2894c8e44b7583589184eea 100644
--- a/source/Lib/EncoderLib/IntraSearch.cpp
+++ b/source/Lib/EncoderLib/IntraSearch.cpp
@@ -1764,7 +1764,7 @@ ChromaCbfs IntraSearch::xRecurIntraChromaCodingQT(CodingStructure &cs, Partition
     saveCS.pcv      = cs.pcv;
     saveCS.picture  = cs.picture;
     saveCS.area.repositionTo( cs.area );
-    saveCS.initStructData( -1, false, true );
+    saveCS.initStructData( MAX_INT, false, true );
 
     TransformUnit &tmpTU = saveCS.addTU(currArea, partitioner.chType);