got non-fix code working in new makefun tool