Removing a potential security hole