Normalization fix