Fixing the serializer issue