Fixed json parsing issue