same as #82, may break tests
Merge pull request #110 from Jalle19/fix-role-once-again

same as #82, may break tests