Fix span format