issue #80 fixed