Fixed a bug where wrong XML output was generated because of an unnecessary work-around