Fixes issue #18.