Fix event ordering on JDK 1.7