Fixed issue with role not being set