Fixed defect breaking toggle