Fixed general on/off switch issue