Fixes #1120, adds correct conditions to toggle as well