Unlocking Cancel Action bug fix