Try a fix on badges