Fix FS bug, again