Fix event setup