Fixing problem with roles