Temp fix for json escaping issue