Mods to deal with aliasing problem.