Fixes issue #26.