fix aggressive find/replace