Feature/issue 63 badge fix