Fixed 883236

Ok I prepared two versions one without the span which appeared useless and another retaining it. I am pushing this for now.