Avoid or control over-etching