Attempted fix for roles assignment issue #493