This fixes issue #8