Underscore remediation