Got rid of unnecessary re-fetching of the same data.