Fix issue #73