fixing some escaping bug