FIXUP - switcher failures