Fixed issue with Serializer not serializing correctly enums