MANTA-69 further adjust the spanning definition