diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/IR.cpp b/sapfor/experts/Sapfor_2017/_src/CFGraph/IR.cpp
index 463ab4c..a691586 100644
--- a/sapfor/experts/Sapfor_2017/_src/CFGraph/IR.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/IR.cpp
@@ -1316,7 +1316,9 @@ static SgStatement* processStatement(SgStatement* st, vector<IR_Block*>& blocks,
         {
             SgStatement* body = select->defOption()->lexNext();
 
-            while (body != lastSelect)
+            while (body != lastSelect &&
+                body->variant() != CASE_NODE &&
+                body->variant() != DEFAULT_NODE)
             {
                 const int firstInstr = blocks.size();
                 body = processLabel(processStatement(body, blocks, labels, func, commonVars, settings), firstInstr, blocks, labels);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 78f71bd..0408393 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2224"
+#define VERSION_SPF "2225"