Fixes issue #86