Fix event stack order