quick hack to deal with fif, needs clean up