diff --git a/dvm/fdvm/trunk/parser/lexfdvm.c b/dvm/fdvm/trunk/parser/lexfdvm.c
index a155941..13285a0 100644
--- a/dvm/fdvm/trunk/parser/lexfdvm.c
+++ b/dvm/fdvm/trunk/parser/lexfdvm.c
@@ -1168,7 +1168,7 @@ top:
 				break;
 			else
 				*p = c;
-                if ((prefix[1]=='$') && (prefix[2]==' ')) { /*OMP*/
+                if ((prefix[1]=='$') && ((prefix[2]==' ') || isdigit(prefix[2]))) { /*OMP*/
                     if(OMP_program==1 ) {   
 			for (p = prefix; p < prefixend; p++) {/*OMP*/
 				*p = ' ';/*OMP*/
@@ -1512,7 +1512,7 @@ top:
 
 		for (; p < prefixend; p++)
 			*p = ' ';
-                if ((prefix[1]=='$') && (prefix[2]!='O') && (prefix[2]!='o')) { /*OMP*/ 
+                if ((prefix[1]=='$') && ((prefix[2]==' ') || (prefix[2]=='&'))) { /*OMP*/ 
                     if (OMP_program == 1) {  /*OMP*/   
 			for (p = prefix; p < prefixend; p++) {/*OMP*/
 				*p = ' ';/*OMP*/
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index b157f40..f665c66 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 "2226"
+#define VERSION_SPF "2227"