toggle issue fix