Fix duplicate roles