initial work on issue #160