#14 isSpan CS fix