make normalization optional to fix #408, #405