underscore bug corrected