Fix event bug 2