Fix cancel propagation ordering