diff --git a/test/xsdtest/xsdtest.xml b/test/xsdtest/xsdtest.xml
index b8a6de9b..2807d267 100644
--- a/test/xsdtest/xsdtest.xml
+++ b/test/xsdtest/xsdtest.xml
@@ -657,6 +657,7 @@ B EEF </value>
 </datatype>
 <datatype name="byte">
 <valid>1</valid>
+<valid> 1 </valid>
 <valid>127</valid>
 <valid>-128</valid>
 <invalid>128</invalid>
@@ -665,6 +666,7 @@ B EEF </value>
 <datatype name="unsignedLong">
 <valid>1</valid>
 <valid>+1</valid>
+<valid> 1 </valid>
 <invalid>-1</invalid>
 <valid>0</valid>
 <valid>18446744073709551615</valid>
@@ -674,6 +676,7 @@ B EEF </value>
 <datatype name="unsignedInt">
 <valid>1</valid>
 <valid>+1</valid>
+<valid> 1 </valid>
 <valid>0</valid>
 <valid>4294967295</valid>
 <invalid>4294967296</invalid>
@@ -682,6 +685,7 @@ B EEF </value>
 <datatype name="unsignedShort">
 <valid>1</valid>
 <valid>+1</valid>
+<valid> 1 </valid>
 <valid>0</valid>
 <valid>65535</valid>
 <invalid>65536</invalid>
@@ -689,6 +693,7 @@ B EEF </value>
 </datatype>
 <datatype name="unsignedByte">
 <valid>1</valid>
+<valid> 1 </valid>
 <valid>+1</valid>
 <valid>0</valid>
 <valid>255</valid>
diff --git a/xmlschemastypes.c b/xmlschemastypes.c
index 419c1910..5d588eea 100644
--- a/xmlschemastypes.c
+++ b/xmlschemastypes.c
@@ -3304,6 +3304,8 @@ xmlSchemaValAtomicType(xmlSchemaTypePtr type, const xmlChar * value,
 
                 if (cur == NULL)
                     goto return1;
+		if (normOnTheFly)
+		    while IS_WSP_BLANK_CH(*cur) cur++;
                 if (*cur == '-') {
                     sign = 1;
                     cur++;
@@ -3312,6 +3314,8 @@ xmlSchemaValAtomicType(xmlSchemaTypePtr type, const xmlChar * value,
                 ret = xmlSchemaParseUInt(&cur, &lo, &mi, &hi);
                 if (ret < 0)
                     goto return1;
+		if (normOnTheFly)
+		    while IS_WSP_BLANK_CH(*cur) cur++;
                 if (*cur != 0)
                     goto return1;
                 if (type->builtInType == XML_SCHEMAS_LONG) {
@@ -3376,9 +3380,13 @@ xmlSchemaValAtomicType(xmlSchemaTypePtr type, const xmlChar * value,
 
                 if (cur == NULL)
                     goto return1;
+		if (normOnTheFly)
+		    while IS_WSP_BLANK_CH(*cur) cur++;
                 ret = xmlSchemaParseUInt(&cur, &lo, &mi, &hi);
                 if (ret < 0)
                     goto return1;
+		if (normOnTheFly)
+		    while IS_WSP_BLANK_CH(*cur) cur++;
                 if (*cur != 0)
                     goto return1;
                 if (type->builtInType == XML_SCHEMAS_ULONG) {