Tweaking escape method from last commit