fix switch a little