fixed over zealous replace