Had to fix handling of non-standard header and colspans