Improve reliability on lines that do not match