Fixes issue #29.