Gf fix event order

Fix the order in the event.