Fixes issue #17.