Removed bug with escape chars