Fixes: #1716 IP and Mac unicity