Fixing Filelist Overflow issue