Fix ordering of events