Readd correct iterator for role_term