diff --git a/bacnet-stack/demo/object/device-client.c b/bacnet-stack/demo/object/device-client.c
index aedd2a1b..962f6554 100644
--- a/bacnet-stack/demo/object/device-client.c
+++ b/bacnet-stack/demo/object/device-client.c
@@ -569,7 +569,7 @@ bool Device_Valid_Object_Name(
     struct object_functions *pObject = NULL;
 
     max_objects = Device_Object_List_Count();
-    for (i = 0; i < max_objects; i++) {
+    for (i = 1; i <= max_objects; i++) {
         check_id = Device_Object_List_Identifier(i, &type, &instance);
         if (check_id) {
             pObject = Device_Objects_Find_Functions(type);
diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index 1c12d768..c4b479ef 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -194,7 +194,7 @@ static object_functions_t My_Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
-#if 0        
+#if 0
     {OBJECT_CHARACTERSTRING_VALUE,
             CharacterString_Value_Init,
             CharacterString_Value_Count,
@@ -210,7 +210,7 @@ static object_functions_t My_Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
-#endif        
+#endif
 #if defined(INTRINSIC_REPORTING)
     {OBJECT_NOTIFICATION_CLASS,
             Notification_Class_Init,
@@ -304,7 +304,7 @@ static object_functions_t My_Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
-#endif        
+#endif
     {OBJECT_TRENDLOG,
             Trend_Log_Init,
             Trend_Log_Count,
@@ -1025,7 +1025,7 @@ bool Device_Valid_Object_Name(
     struct object_functions *pObject = NULL;
 
     max_objects = Device_Object_List_Count();
-    for (i = 0; i < max_objects; i++) {
+    for (i = 1; i <= max_objects; i++) {
         check_id = Device_Object_List_Identifier(i, &type, &instance);
         if (check_id) {
             pObject = Device_Objects_Find_Functions(type);
diff --git a/bacnet-stack/ports/at91sam7s/device.c b/bacnet-stack/ports/at91sam7s/device.c
index 7e339df3..d879e026 100644
--- a/bacnet-stack/ports/at91sam7s/device.c
+++ b/bacnet-stack/ports/at91sam7s/device.c
@@ -575,7 +575,7 @@ bool Device_Valid_Object_Name(
     struct my_object_functions *pObject = NULL;
 
     max_objects = Device_Object_List_Count();
-    for (i = 0; i < max_objects; i++) {
+    for (i = 1; i <= max_objects; i++) {
         check_id = Device_Object_List_Identifier(i, &type, &instance);
         if (check_id) {
             pObject = Device_Objects_Find_Functions((BACNET_OBJECT_TYPE) type);
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/device.c b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
index 57707eff..db2745b9 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/device.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
@@ -502,7 +502,7 @@ bool Device_Valid_Object_Name(
     struct my_object_functions *pObject = NULL;
 
     max_objects = Device_Object_List_Count();
-    for (i = 0; i < max_objects; i++) {
+    for (i = 1; i <= max_objects; i++) {
         check_id = Device_Object_List_Identifier(i, &type, &instance);
         if (check_id) {
             pObject = Device_Objects_Find_Functions((BACNET_OBJECT_TYPE) type);
diff --git a/bacnet-stack/ports/rx62n/device.c b/bacnet-stack/ports/rx62n/device.c
index 991ccede..23bc7e26 100644
--- a/bacnet-stack/ports/rx62n/device.c
+++ b/bacnet-stack/ports/rx62n/device.c
@@ -547,7 +547,7 @@ bool Device_Valid_Object_Name(
     char *name = NULL;
 
     max_objects = Device_Object_List_Count();
-    for (i = 0; i < max_objects; i++) {
+    for (i = 1; i <= max_objects; i++) {
         check_id = Device_Object_List_Identifier(i, &type, &instance);
         if (check_id) {
             name = Device_Valid_Object_Id(type, instance);
diff --git a/bacnet-stack/ports/stm32f10x/device.c b/bacnet-stack/ports/stm32f10x/device.c
index a04935d5..f5d9fd6d 100644
--- a/bacnet-stack/ports/stm32f10x/device.c
+++ b/bacnet-stack/ports/stm32f10x/device.c
@@ -561,7 +561,7 @@ bool Device_Valid_Object_Name(
     struct my_object_functions *pObject = NULL;
 
     max_objects = Device_Object_List_Count();
-    for (i = 0; i < max_objects; i++) {
+    for (i = 1; i <= max_objects; i++) {
         check_id = Device_Object_List_Identifier(i, &type, &instance);
         if (check_id) {
             pObject = Device_Objects_Find_Functions((BACNET_OBJECT_TYPE) type);