Fixed critical escaping bug