Fixes issue #380.