diff --git a/RGB.NET.Core/Devices/RGBDeviceType.cs b/RGB.NET.Core/Devices/RGBDeviceType.cs
index 152c43c..b0de5e3 100644
--- a/RGB.NET.Core/Devices/RGBDeviceType.cs
+++ b/RGB.NET.Core/Devices/RGBDeviceType.cs
@@ -13,11 +13,6 @@ namespace RGB.NET.Core
         /// </summary>
         None = 0,
 
-        /// <summary>
-        /// Represents a device where the type is not known or not present in the list.
-        /// </summary>
-        Unknown = -1,
-
         /// <summary>
         /// Represents a keyboard.
         /// </summary>
@@ -88,6 +83,11 @@ namespace RGB.NET.Core
         /// </summary>
         Cooler = 1 << 13,
 
+        /// <summary>
+        /// Represents a device where the type is not known or not present in the list.
+        /// </summary>
+        Unknown = 1 << 31,
+
         /// <summary>
         /// Represents all devices.
         /// </summary>
diff --git a/RGB.NET.Core/RGBSurface.cs b/RGB.NET.Core/RGBSurface.cs
index 12a8e7b..d2933c7 100644
--- a/RGB.NET.Core/RGBSurface.cs
+++ b/RGB.NET.Core/RGBSurface.cs
@@ -250,7 +250,7 @@ namespace RGB.NET.Core
         /// <param name="deviceType">The <see cref="RGBDeviceType"/> of the devices to get.</param>
         /// <returns>a list of devices matching the specified <see cref="RGBDeviceType"/>.</returns>
         public IList<IRGBDevice> GetDevices(RGBDeviceType deviceType)
-            => new ReadOnlyCollection<IRGBDevice>(deviceType == RGBDeviceType.All ? _devices : _devices.Where(x => x.DeviceInfo.DeviceType == deviceType).ToList());
+            => new ReadOnlyCollection<IRGBDevice>(_devices.Where(d => deviceType.HasFlag(d.DeviceInfo.DeviceType)).ToList());
 
         /// <summary>
         /// Registers the provided <see cref="IUpdateTrigger"/>.