work on issue #73