issue #80 done