hotfix for XML issues