issue #67 fixed