Fixes issue #642.