Fixed bug with column headers