diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h
index b7a441c0a..2dda81d2a 100644
--- a/include/hamlib/riglist.h
+++ b/include/hamlib/riglist.h
@@ -32,7 +32,7 @@
 // With a max of 1000 models per backend we get total a model number range of 1001-33001
 // This MAX was 100 prior to 2020-02-18 and Icom was close to running out of the 100 range
 #define  MAX_MODELS_PER_BACKEND 1000
-#define RIG_MAKE_MODEL(a,b) ((a)*MAX_MODELS_PER_BACKEND+(b))
+#define RIG_MAKE_MODEL(a,b) (MAX_MODELS_PER_BACKEND*(a)+(b))
 #define RIG_BACKEND_NUM(a) ((a)/MAX_MODELS_PER_BACKEND)
 
 //! @endcond
diff --git a/include/hamlib/rotlist.h b/include/hamlib/rotlist.h
index 37d410846..0fff30f3a 100644
--- a/include/hamlib/rotlist.h
+++ b/include/hamlib/rotlist.h
@@ -24,7 +24,7 @@
 #define _ROTLIST_H 1
 
 //! @cond Doxygen_Suppress
-#define ROT_MAKE_MODEL(a,b) ((a)*100+(b))
+#define ROT_MAKE_MODEL(a,b) (100*(a)+(b))
 #define ROT_BACKEND_NUM(a) ((a)/100)
 //! @endcond