Fixed issue with duplicate escape chars