Fix protocol exchange