Added check on file containment