Add workaround for lens problem and corrected the directory-tree lower bound