Fix ordering of events within groups