Less confusion

@adamof this solves the issue we had while pairing.