Fixing roles check