This fixes issue #120.