fixed pairing errors