- Changed escapeString