Fixing escaping