Fixing escaping in strings