revise escaping position
merge conflict resolved
Merge pull request #247 from tongxiang/escaping

revise escaping position