Bugfix 18 underscore fixes