Nfactor fix