FS-6271 fix for windows