event timing fix