Fix issue #82, and make the fix to issue #83 visible