Fixing the JSON support