Fix event sending