Toggle: fixes #3431 toggle on/off behaviour
Merge pull request #3442 from patheard/toggle

Toggle: fixes #3431 toggle on/off behaviour