Fix: Record order should be same as DB columns