Fixed json unmarshalling