Handle aggregate columns and don't break on new file handles