Fixed underscore handling