Try a fix on the badges