D39 block, cancel logic changed