Fixed FS implementation