Bugfix in XML mapping