switchOnSelect_fixed