Better fix for OmniSwitch fail