Multiswitch bug fix.