Fix for undeleted option entries.