Fixed a bug with handling escaped characters (?)