Fixes 6313

Fixes #6313 by making the span class work.