Fix click to span