FIX bug in normalization