Fixes issue #14.