Fix to unescaped JSON