Fix event call issue