Fix for those with span as well