Merge pull request #1769 from Areloch/ToggleChildrenOptionsFix