Fixes issue #9.