fixed underscore bug