Fixed span issue