Fix event response