Fixed #444 - support for disabling toggles