Fix for columns that may have been aliased in the select clause.