Fixed bug with serializer