2.1-8 Fix bug with long badges