This fixes issue #21.