serializer fixed