Fix event extension bug