Fixed possible JSON.stringify issue