Fixed json creation