Fixes issue #487.