Bugfix on event navigation