move to using fixwhich