fixed underscore parsing