fixin underscore issue