Fix the underscore bug #1