diff --git a/Core/gb.c b/Core/gb.c
index b2d271a..2b95d55 100644
--- a/Core/gb.c
+++ b/Core/gb.c
@@ -1329,7 +1329,7 @@ bool GB_is_inited(GB_gameboy_t *gb)
 
 bool GB_is_cgb(GB_gameboy_t *gb)
 {
-    return (gb->model & GB_MODEL_FAMILY_MASK) == GB_MODEL_CGB_FAMILY;
+    return gb->model >= GB_MODEL_CGB_0;
 }
 
 bool GB_is_cgb_in_cgb_mode(GB_gameboy_t *gb)