Should fix bug where badge dissapears