Fix spans overlaping