Bugfix prevented looping firing cancelevent