BugFix for admin check