diff --git a/autotest/Convert/Convert.cpp b/autotest/Convert/Convert.cpp
index 4ba51a426..69e6cc541 100644
--- a/autotest/Convert/Convert.cpp
+++ b/autotest/Convert/Convert.cpp
@@ -107,4 +107,10 @@ CONSOLE_APP_MAIN
 	
 	ASSERT(StrDbl("123xxx") == 123);
 	ASSERT(StrInt("123xxx") == 123);
+	
+	ConvertDouble dd;
+	dd.Pattern("%2.!n EUR");
+	Test(dd, "123 EUR", 123);
+	
+	LOG("=========== OK");
 }
diff --git a/autotest/SqlExp/Test.i b/autotest/SqlExp/Test.i
index 48ba6216f..8881b6966 100644
--- a/autotest/SqlExp/Test.i
+++ b/autotest/SqlExp/Test.i
@@ -119,7 +119,7 @@
 		"insert into \"PLAT_DTM\"(\"PLAT_DTM_SEQ\", \"PRIPAD_SEQ\", \"DATUM\", \"CASTKA\", \"TXT\") select \"SEQ_POPLATEK\".NEXTVAL, 1111, \"DATUM\", \"CASTKA\", \"TXT\" from \"PLAT_DTM\" where \"PRIPAD_SEQ\" = 2222"); // insert into "PLAT_DTM"("PLAT_DTM_SEQ", "PRIPAD_SEQ", "DATUM", "CASTKA", "TXT") select "SEQ_POPLATEK".NEXTVAL, 1111, "DATUM", "CASTKA", "TXT" from "PLAT_DTM" where "PRIPAD_SEQ" = 2222
 	TEST(MSSQL,
 		Insert(PLAT_DTM) (PLAT_DTM_SEQ, NextVal(SEQ_POPLATEK)) (PRIPAD_SEQ, 1111) (DATUM) (CASTKA) (TXT) .From(PLAT_DTM).Where(PRIPAD_SEQ == 2222),
-		"insert into \"PLAT_DTM\"(\"PLAT_DTM_SEQ\", \"PRIPAD_SEQ\", \"DATUM\", \"CASTKA\", \"TXT\") select \"SEQ_POPLATEK\".NEXTVAL, 1111, \"DATUM\", \"CASTKA\", \"TXT\" from \"PLAT_DTM\" where \"PRIPAD_SEQ\" = 2222"); // insert into "PLAT_DTM"("PLAT_DTM_SEQ", "PRIPAD_SEQ", "DATUM", "CASTKA", "TXT") select "SEQ_POPLATEK".NEXTVAL, 1111, "DATUM", "CASTKA", "TXT" from "PLAT_DTM" where "PRIPAD_SEQ" = 2222
+		"insert into \"PLAT_DTM\"(\"PLAT_DTM_SEQ\", \"PRIPAD_SEQ\", \"DATUM\", \"CASTKA\", \"TXT\") select next value for \"SEQ_POPLATEK\", 1111, \"DATUM\", \"CASTKA\", \"TXT\" from \"PLAT_DTM\" where \"PRIPAD_SEQ\" = 2222"); // insert into "PLAT_DTM"("PLAT_DTM_SEQ", "PRIPAD_SEQ", "DATUM", "CASTKA", "TXT") select next value for "SEQ_POPLATEK", 1111, "DATUM", "CASTKA", "TXT" from "PLAT_DTM" where "PRIPAD_SEQ" = 2222
 	TEST(PGSQL,
 		Insert(PLAT_DTM) (PLAT_DTM_SEQ, NextVal(SEQ_POPLATEK)) (PRIPAD_SEQ, 1111) (DATUM) (CASTKA) (TXT) .From(PLAT_DTM).Where(PRIPAD_SEQ == 2222),
 		"insert into \"PLAT_DTM\"(\"PLAT_DTM_SEQ\", \"PRIPAD_SEQ\", \"DATUM\", \"CASTKA\", \"TXT\") select nextval('SEQ_POPLATEK'), 1111, \"DATUM\", \"CASTKA\", \"TXT\" from \"PLAT_DTM\" where \"PRIPAD_SEQ\" = 2222"); // insert into "PLAT_DTM"("PLAT_DTM_SEQ", "PRIPAD_SEQ", "DATUM", "CASTKA", "TXT") select nextval('SEQ_POPLATEK'), 1111, "DATUM", "CASTKA", "TXT" from "PLAT_DTM" where "PRIPAD_SEQ" = 2222
@@ -911,7 +911,7 @@
 		"select \"SEQ\".NEXTVAL from DUAL"); // select "SEQ".NEXTVAL from DUAL
 	TEST(MSSQL,
 		Select(NextVal(SEQ)).Get(),
-		"select \"SEQ\".NEXTVAL"); // select "SEQ".NEXTVAL
+		"select next value for \"SEQ\""); // select next value for "SEQ"
 	TEST(PGSQL,
 		Select(NextVal(SEQ)).Get(),
 		"select nextval('SEQ')"); // select nextval('SEQ')