This fixes issue #10