diff --git a/MU3Input/IO/TcpIO.cs b/MU3Input/IO/TcpIO.cs
index 3dfb9e7..376c16e 100644
--- a/MU3Input/IO/TcpIO.cs
+++ b/MU3Input/IO/TcpIO.cs
@@ -121,13 +121,13 @@ private unsafe void Receive(MessageType type)
             }
             else if (type == MessageType.Test && networkStream.Read(_inBuffer, 0, 1) > 0)
             {
-                if (_inBuffer[0] == 0) data.OptButtons ^= OptButtons.Test;
+                if (_inBuffer[1] == 0) data.OptButtons &= ~OptButtons.Test;
                 else data.OptButtons |= OptButtons.Test;
                 Debug.WriteLine(Data.OptButtons);
             }
             else if (type == MessageType.Service && networkStream.Read(_inBuffer, 0, 1) > 0)
             {
-                if (_inBuffer[0] == 0) data.OptButtons ^= OptButtons.Service;
+                if (_inBuffer[1] == 0) data.OptButtons &= ~OptButtons.Service;
                 else data.OptButtons |= OptButtons.Service;
                 Debug.WriteLine(Data.OptButtons);
             }
diff --git a/MU3Input/IO/UdpIO.cs b/MU3Input/IO/UdpIO.cs
index 6442d29..9c1462c 100644
--- a/MU3Input/IO/UdpIO.cs
+++ b/MU3Input/IO/UdpIO.cs
@@ -90,13 +90,13 @@ private unsafe void ParseBuffer(byte[] buffer)
             }
             else if (buffer[0] == (byte)MessageType.Test && buffer.Length == 2)
             {
-                if (buffer[1] == 0) data.OptButtons ^= OptButtons.Test;
+                if (buffer[1] == 0) data.OptButtons &= ~OptButtons.Test;
                 else data.OptButtons |= OptButtons.Test;
                 Debug.WriteLine(Data.OptButtons);
             }
             else if (buffer[0] == (byte)MessageType.Service && buffer.Length == 2)
             {
-                if (buffer[1] == 0) data.OptButtons ^= OptButtons.Service;
+                if (buffer[1] == 0) data.OptButtons &= ~OptButtons.Service;
                 else data.OptButtons |= OptButtons.Service;
                 Debug.WriteLine(Data.OptButtons);
             }
diff --git a/MU3Input/IO/UsbmuxIO.cs b/MU3Input/IO/UsbmuxIO.cs
index 7fe634d..c3174eb 100644
--- a/MU3Input/IO/UsbmuxIO.cs
+++ b/MU3Input/IO/UsbmuxIO.cs
@@ -126,13 +126,13 @@ private unsafe void Receive(MessageType type)
             }
             else if (type == MessageType.Test && !iDevice.idevice_connection_receive(connection, _inBuffer, 1, ref len).IsError())
             {
-                if (_inBuffer[0] == 0) data.OptButtons ^= OptButtons.Test;
+                if (buffer[1] == 0) data.OptButtons &= ~OptButtons.Test;
                 else data.OptButtons |= OptButtons.Test;
                 Debug.WriteLine(Data.OptButtons);
             }
             else if (type == MessageType.Service && !iDevice.idevice_connection_receive(connection, _inBuffer, 1, ref len).IsError())
             {
-                if (_inBuffer[0] == 0) data.OptButtons ^= OptButtons.Service;
+                if (buffer[1] == 0) data.OptButtons &= ~OptButtons.Service;
                 else data.OptButtons |= OptButtons.Service;
                 Debug.WriteLine(Data.OptButtons);
             }