#61 Disable switching