OmniSwitch: Fix [1/2]