Span fix

See commit message.