JSON bug fix - Shreenidhi