Fixing event ordering.