This needs to be handled in the XML parser as well.