Fix for the serializer bug