Fix up Toggle Manager