fixed order fetch bug