Fixed roles handling