Fixed json deserialization