cancel bug fixed