Fixes issue #31.