cancel bug fix