Before XML Serializer fix