Fixed <span> issue