Attempts to fix the underscore issue