Fix to make 'no' normalisation work properly.