fixed span issues