Fix Serializer