work on issue #89