Replace nonfunctional unless