fix switch choice code