fix the roles stuff