Fixed issue related to roles