Fixed switching issue