on issue #78