Fix for FS interop