[#2673] Fix cancelling.