Badge fix #2