work on issue #108