Get event order right (Try 2!)