Fix echo in span handling.