more defensive editing