Spanclass fixes

This should fix the issues described in #4665

Fixes #4665
you can make two of the span I guess, but dunno if it should be done or not