possible security improvement (#1926)