Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1105)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1106)
@@ -2633,8 +2633,4 @@
   CommonDecoderParams* params = this->getCommonDecoderParams();
 
-#if !FIX_CONF_MODE
-  assert( params->getTargetLayerId() < vps->getMaxLayers() );
-#endif
-
   if( params->getValueCheckedFlag() )
   {
@@ -2739,10 +2735,10 @@
 
   }
-#if FIX_CONF_MODE
+
   // Set correct value of targetLayerId
   Int targetOlsIdx = params->getTargetOutputLayerSetIdx();
   Int targetLsIdx = vps->getOutputLayerSetIdx( targetOlsIdx );
   params->setTargetLayerId( vps->getLayerSetLayerIdList( targetLsIdx, vps->getNumLayersInIdList(targetLsIdx)-1 ) );
-#endif
+
 #if FIX_NON_OUTPUT_LAYER
   // Check if the current layer is an output layer