Fix column order