fixed underscore issue