Fix Role handle