Fixed json serialization