Added a fix for json formatting error