moved pair loading to resolve to fix race conditions