Fixes issue #16.