diff --git a/src/config.c b/src/config.c
index 9b7424f..17655ed 100644
--- a/src/config.c
+++ b/src/config.c
@@ -292,7 +292,7 @@ static const TidyOptionImpl option_defs[] =
     { TidySortAttributes,          PP, "sort-attributes",             IN, TidySortAttrNone,ParsePickList,     &sorterPicks        },
     { TidyStrictTagsAttr,          MU, "strict-tags-attributes",      BL, no,              ParsePickList,     &boolPicks          }, /* 20160209 - Issue #350 */
     { TidyTabSize,                 PP, "tab-size",                    IN, 8,               ParseInt,          NULL                },
-    { TidyUpperCaseAttrs,          MU, "uppercase-attributes",        IN, no,              ParsePickList,     &attributeCasePicks },
+    { TidyUpperCaseAttrs,          MU, "uppercase-attributes",        IN, TidyUppercaseNo, ParsePickList,     &attributeCasePicks },
     { TidyUpperCaseTags,           MU, "uppercase-tags",              BL, no,              ParsePickList,     &boolPicks          },
     { TidyUseCustomTags,           MU, "custom-tags",                 IN, TidyCustomNo,    ParsePickList,     &customTagsPicks    }, /* 20170309 - Issue #119 */
     { TidyVertSpace,               PP, "vertical-space",              IN, no,              ParsePickList,     &autoBoolPicks      }, /* #228 - tri option */
@@ -1034,7 +1034,7 @@ void AdjustConfig( TidyDocImpl* doc )
     {
         TY_(SetOptionBool)( doc, TidyXmlOut, yes );
         TY_(SetOptionBool)( doc, TidyUpperCaseTags, no );
-        TY_(SetOptionBool)( doc, TidyUpperCaseAttrs, no );
+        TY_(SetOptionInt)( doc, TidyUpperCaseAttrs, no );
         /* TY_(SetOptionBool)( doc, TidyXmlPIs, yes ); */
     }
 
diff --git a/src/parser.c b/src/parser.c
index 1bda019..a037280 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -4832,7 +4832,7 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
                 /* adjust other config options, just as in config.c */
                 if ( !htmlOut )
                 {
-                    TY_(SetOptionInt)( doc, TidyUpperCaseTags, no );
+                    TY_(SetOptionBool)( doc, TidyUpperCaseTags, no );
                     TY_(SetOptionInt)( doc, TidyUpperCaseAttrs, no );
                 }
             }
diff --git a/src/pprint.c b/src/pprint.c
index 747c381..9106396 100644
--- a/src/pprint.c
+++ b/src/pprint.c
@@ -1238,7 +1238,7 @@ static void PPrintAttribute( TidyDocImpl* doc, uint indent,
     Bool xmlOut    = cfgBool( doc, TidyXmlOut );
     Bool xhtmlOut  = cfgBool( doc, TidyXhtmlOut );
     Bool wrapAttrs = cfgBool( doc, TidyWrapAttVals );
-    uint ucAttrs   = cfgBool( doc, TidyUpperCaseAttrs );
+    uint ucAttrs   = cfg( doc, TidyUpperCaseAttrs );
     Bool indAttrs  = cfgBool( doc, TidyIndentAttributes );
     uint xtra      = AttrIndent( doc, node, attr );
     Bool first     = AttrNoIndentFirst( /*doc,*/ node, attr );