legacy span fix.