Fixed persistence of Toggle State (Fixes #43)