Fixed escaping bug