Fixed json implemetion