Fix toggle regression. Closes #513.