#559 Fixes column reordering issue when hidden and/or pre- columns are present