#42 - remove underscore. (not tested!)