Fix order dependent fetching.