Fix to PairWise