enhance 7cf4c12 - hardened by admin only