Fix estimate pairwise with new refactoring