Fix Enum serialization