CON-804 | remove escaping opportunity