Fixed issue relating to JSON data