Fixes issue #74