diff --git a/include/patty/ax25/macros.h b/include/patty/ax25/macros.h
index 55aa2a3..724baab 100644
--- a/include/patty/ax25/macros.h
+++ b/include/patty/ax25/macros.h
@@ -47,22 +47,22 @@
     ((c & 0xe0) >> 5)
 
 #define PATTY_AX25_CONTROL_UNNUMBERED_SABM(c) \
-    (((c & 0xe0) == 0x20) && ((c & 0x0f) == 0x0f))
+    ((c & 0xef) == 0x2f)
 
 #define PATTY_AX25_CONTROL_UNNUMBERED_DISC(c) \
-    (((c & 0xe0) == 0x40) && ((c & 0x0f) == 0x03))
+    ((c & 0xef) == 0x43)
 
 #define PATTY_AX25_CONTROL_UNNUMBERED_DM(c) \
-    (((c & 0xe0) == 0x00) && ((c & 0x0f) == 0x0f))
+    ((c & 0xef) == 0x0f)
 
 #define PATTY_AX25_CONTROL_UNNUMBERED_UA(c) \
-    (((c & 0xe0) == 0x60) && ((c & 0x0f) == 0x03))
+    ((c & 0xef) == 0x63)
 
 #define PATTY_AX25_CONTROL_UNNUMBERED_FRMR(c) \
-    (((c & 0xe0) == 0x40) && ((c & 0x0f) == 0x07))
+    ((c & 0xef) == 0x47)
 
 #define PATTY_AX25_CONTROL_UNNUMBERED_INFO(c) \
-    (((c & 0xe0) == 0x00) && ((c & 0x0f) == 0x03))
+    ((c & 0xef) == 0x03)
 
 #define PATTY_AX25_CONTROL_SEQ_SEND(c) \
     ((c & 0x0e) >> 1)