fix  switch