Fixes T22, 'The 5 badge mistake'