initial work on issue #86