Fix underscore bug