fix over-zealous search and replace