Improve switch behavior