toggle issue fix
Merge pull request #208 from benitoro/master

toggle issue fix