More switch fix.