Further attempt at fixing escaping