fix switch_step