Toggle Button fix