Added support for escape.