add support for escaped characters