Fix infinite loop on cancel transaction