resolve cancel bug