issue #79 fixed