fixed ordering when fetching data