fixed the only known issue (cancel sometimes lagging or taking forever)