diff --git a/libril/ril.cpp b/libril/ril.cpp
index 1661d18..9952d44 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -2519,9 +2519,9 @@
     if (s_callbacks.version < 5) {
         RLOGD("responseDataCallList: v4");
         return responseDataCallListV4(p, response, responselen);
-    } else if (responselen % sizeof(RIL_Data_Call_Response_v6) == 0) {
+    } else if (s_callbacks.version < 10) {
         return responseDataCallListV6(p, response, responselen);
-    } else if (responselen % sizeof(RIL_Data_Call_Response_v9) == 0) {
+    } else if (s_callbacks.version == 10) {
         return responseDataCallListV9(p, response, responselen);
     } else {
         if (response == NULL && responselen != 0) {