This fixes issue #43