Develop fix control switch bug