Fixed switches
Merge pull request #638 from dswd/fix-switches

Fixed switches