Quick update before release. Fixes not returning if event cancelled