Fix next_on_air