Added char escaping and fixed issue with pars