This fixes issue #2