fix fid handling