This fixes issue #119.