Bugfixing switches.