Fixed escaping problem