Fix collspan issue