Fix to use role index not display name