fixed issue #79