Hacking to speed up this FS lookup