Fix escaping early...