work on issue #84