Fix role retraction