Fixing overeager find and replace