improve stable of switch