fixed over zealous search/replace