Performance fix (about large number of files)