Sorting does not work with colspans in header

If there are cells in the header which span more than 1 cell, the sorting does not work and is off (sorting on the header cell does not sort what is directly beneath it). Is there a way to work around this currently, other than setting the colspans of my table to 1?