Fixes issue #81