Fixed peer logic re-fetching