Fixed Norm replacing bug with conditions