Fix for XML return value escaping