Replace when + not with unless