escape added back (again)