Actually fix the column headers bug