Should fix the pairing not taken into account problem, ping @AlexFaraino