OmniSwitch: Fix [2/2]