Fix a major bug: cannot include '_'