Serializer fix