Fixing an escaping bug