Fix issue #81