Fix match cancellation