Fixes issue #80