diff --git a/ttmath/ttmathbig.h b/ttmath/ttmathbig.h
index d65a1eb..cd3e733 100644
--- a/ttmath/ttmathbig.h
+++ b/ttmath/ttmathbig.h
@@ -2734,7 +2734,7 @@ private:
 
 
 	/*!
-		we're testing whether is there a comma operator
+		we're testing whether there's a comma operator
 	*/
 	bool FromString_TestCommaOperator(const char * & source)
 	{
diff --git a/ttmath/ttmathparser.h b/ttmath/ttmathparser.h
index b72359a..e0bdc83 100644
--- a/ttmath/ttmathparser.h
+++ b/ttmath/ttmathparser.h
@@ -1553,7 +1553,10 @@ int  character;
 	return 2;
 	}
 	else
-	if( character=='#' || character=='&' || CharToDigit(character, base)!=-1 )
+	if( character=='#' || character=='&' ||
+		character==TTMATH_COMMA_CHARACTER_1 ||
+		(character==TTMATH_COMMA_CHARACTER_2 && TTMATH_COMMA_CHARACTER_2 != 0) ||
+		CharToDigit(character, base)!=-1 )
 	{
 		/*
 			warning: