Fix error_span fix