Normalization is robuster now. #1