fixes #505
Merge pull request #521 from magfest/badge_unsetting

fixes #505