Fix order of events