Fixes issue #8.