current span fix