Fix Readdir + Improved