Fixing xml parsing