Fix problems with multiple badge applications