get rid of Fs workaround