Correction on  badge

Fix issue #528, #529 and #530.