fixed underscore stripping