Fix toggling.

This fixes #18 and also resolves #15