Fix duplicate host pairing