Make cancel work (bug 957774)