properly drop underscore