Fixed up role grabber