diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 06cd441..fc746de 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1243,17 +1243,6 @@ XMLElement::~XMLElement()
 }
 
 
-XMLAttribute* XMLElement::FindAttribute( const char* name )
-{
-    for( XMLAttribute* a = _rootAttribute; a; a = a->_next ) {
-        if ( XMLUtil::StringEqual( a->Name(), name ) ) {
-            return a;
-        }
-    }
-    return 0;
-}
-
-
 const XMLAttribute* XMLElement::FindAttribute( const char* name ) const
 {
     for( XMLAttribute* a = _rootAttribute; a; a = a->_next ) {
diff --git a/tinyxml2.h b/tinyxml2.h
index 10ba955..a5d145b 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -1491,7 +1491,9 @@ private:
     XMLElement( const XMLElement& );	// not supported
     void operator=( const XMLElement& );	// not supported
 
-    XMLAttribute* FindAttribute( const char* name );
+    XMLAttribute* FindAttribute( const char* name ) {
+        return const_cast<XMLAttribute*>(const_cast<const XMLElement*>(this)->FindAttribute( name ));
+    }
     XMLAttribute* FindOrCreateAttribute( const char* name );
     //void LinkAttribute( XMLAttribute* attrib );
     char* ParseAttributes( char* p );