Nasty hack to support badge issuing too