fix switch / scenario feature