This fixes issue #5