#91 has been fixed by refactoring the file list