better modifier escaping again