Serializer bugfix