Fixes issue #83