Fixes issue #5.