Pairing fix