issue #116 done