Fix an error withn the select of roles
Minor refactor