Improvement on notFound flag