Fix issue #84