Fixes issue #43