Fixed helper, using badge