Added fix for XML parsing issues in MT environment