Persisting On\Off state bug