Gf fix event order