fix get switch bug
merge from lab pc