Improved handling of delayed events