issue #116 finalized