diff --git a/src/Participants/ParticipantUDP.cs b/src/Participants/ParticipantUDP.cs
index 4e085d2..ab4cfa2 100644
--- a/src/Participants/ParticipantUDP.cs
+++ b/src/Participants/ParticipantUDP.cs
@@ -44,6 +44,9 @@ namespace RoboidControl {
         /// <param name="port">The port number of the site server</param>
         /// <param name="localPort">The port used by the local participant</param>
         public ParticipantUDP(string ipAddress, int port = 7681, int localPort = 7681) : base("127.0.0.1", localPort) {
+            this.ipAddress = ipAddress;
+            this.port = port;
+
             // Determine local IP address
             IPAddress localIpAddress = null;
             IPAddress subnetMask = null;
@@ -77,7 +80,7 @@ namespace RoboidControl {
             if (this.port == 0)
                 this.isIsolated = true;
             else
-                this.remoteSite = new Participant(ipAddress, port, this);
+                this.remoteSite = new ParticipantUDP(ipAddress, port, this);
 
             Participant.AddParticipant(this);
             Participant.ReplaceLocalParticipant(this);