Merge pull request #644 from wolfmanjm/fix/switch-execution