added escape clause