This fixes issue #3