Trying again to fix event ordering.