fix next_scenario=null (16075)