Use escape

Fixes #788