Fix issue #79