admin-related hotfix