Fix overzealous : replacement