Fix escaping problem in strings