resolve cancel auth bugs