Badge fix