fixed underscore problem