Merge pull request #5718 from ptpt52/fix-switch