Fix for non-windows clients with large numbers of switches.