Fix issue #83