Fix for xs:int and xs:integer