Fix span elements