Improved handling of the initial event