Fix fetching order