Get rid of duplicated span