Fix event calling