Fix methods to select right number of roles