Fix menu events