Fixed underscore issue