fix non-FileSystem code