Patched again for toggling.