diff --git a/parser.c b/parser.c
index 2c3d90484..c7f46a31a 100644
--- a/parser.c
+++ b/parser.c
@@ -4025,7 +4025,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *attlen, int *outFlags,
     int c, l, quote, entFlags, chunkSize;
     int inSpace = 1;
     int replaceEntities;
-    int normalize = (special & XML_SPECIAL_TYPE_MASK) != 0;
+    int normalize = (special & XML_SPECIAL_TYPE_MASK) > XML_ATTRIBUTE_CDATA;
     int attvalFlags = 0;
 
     /* Always expand namespace URIs */
@@ -8578,7 +8578,7 @@ xmlParseAttribute2(xmlParserCtxtPtr ctxt,
 
 #ifdef LIBXML_VALID_ENABLED
     if ((ctxt->validate) &&
-        (ctxt->standalone) &&
+        (ctxt->standalone == 1) &&
         (special & XML_SPECIAL_EXTERNAL) &&
         (flags & XML_ATTVAL_NORM_CHANGE)) {
         xmlValidityError(ctxt, XML_DTD_NOT_STANDALONE,