Escaping is now fine for #116 and also fixes #126