added escape clause
Merge branch 'staging'