Can this be avoided with a find-and-replace?