Fixed a toggle issue