Fixing json parsing