Another bugfix for the event order.