Index: branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp
===================================================================
--- branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp	(revision 798)
+++ branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp	(revision 799)
@@ -2666,5 +2666,5 @@
     UInt iNuhLId = getLayerIdInNuh(i);
     UInt predIdx = 0;
-    for (UInt j = iNuhLId + 1; j < 63; j++)
+    for (UInt j = iNuhLId + 1; j < MAX_NUM_LAYER_IDS; j++)
     {
       if (getRecursiveRefLayerFlag(j, iNuhLId))
Index: branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 798)
+++ branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 799)
@@ -1317,15 +1317,15 @@
         Int layerNum = 0;
         Int lsIdx = vps->getNumLayerSets() + i;
-        for (Int layerId = 0; layerId <= 62; layerId++)
+        for (Int layerId = 0; layerId < MAX_VPS_LAYER_ID_PLUS1; layerId++)
         {
           vps->setLayerIdIncludedFlag(false, lsIdx, layerId);
-          for (Int treeIdx = 1; treeIdx < vps->getNumIndependentLayers(); treeIdx++)
+        }
+        for (Int treeIdx = 1; treeIdx < vps->getNumIndependentLayers(); treeIdx++)
+        {
+          for (Int layerCnt = 0; layerCnt < vps->getHighestLayerIdxPlus1(i, j); layerCnt++)
           {
-            for (Int layerCnt = 0; layerCnt < vps->getHighestLayerIdxPlus1(i, j); layerCnt++)
-            {
-              vps->setLayerSetLayerIdList(lsIdx, layerNum, vps->getTreePartitionLayerId(treeIdx, layerCnt));
-              vps->setLayerIdIncludedFlag(true, lsIdx, vps->getTreePartitionLayerId(treeIdx, layerCnt));
-              layerNum++;
-            }
+            vps->setLayerSetLayerIdList(lsIdx, layerNum, vps->getTreePartitionLayerId(treeIdx, layerCnt));
+            vps->setLayerIdIncludedFlag(true, lsIdx, vps->getTreePartitionLayerId(treeIdx, layerCnt));
+            layerNum++;
           }
         }