Serializer Fix