Escape chars fix