diff --git a/EEPROM_generator/src/generators/objectlist.js b/EEPROM_generator/src/generators/objectlist.js
index 79bbb02..45beff7 100644
--- a/EEPROM_generator/src/generators/objectlist.js
+++ b/EEPROM_generator/src/generators/objectlist.js
@@ -125,7 +125,7 @@ function objectlist_generator(form, od, indexes)
 				objd.items.slice(subindex).forEach(subitem => {
 					var subi = subindex_padded(subindex);
 					const value = objectlist_getItemValue(subitem, objd.dtype);
-					objectlist += `\n  {${subi}, DTYPE_${objd.dtype}, ${bitsize}, ${objectlist_objdFlags(objd)}, acName${index}_${subi}, ${value}, ${subitem.data || 'NULL'}},`;
+					objectlist += `\n  {0x${subi}, DTYPE_${objd.dtype}, ${bitsize}, ${objectlist_objdFlags(objd)}, acName${index}_${subi}, ${value}, ${subitem.data || 'NULL'}},`;
 					subindex++;
 				});
 				break;
@@ -138,7 +138,7 @@ function objectlist_generator(form, od, indexes)
 					const bitsize = dtype_bitsize[subitem.dtype];
 					const value = objectlist_getItemValue(subitem, subitem.dtype);
 					const atypeflag = objectlist_objdFlags(subitem);
-					objectlist += `\n  {${subi}, DTYPE_${subitem.dtype}, ${bitsize}, ${atypeflag}, acName${index}_${subi}, ${value}, ${subitem.data || 'NULL'}},`;
+					objectlist += `\n  {0x${subi}, DTYPE_${subitem.dtype}, ${bitsize}, ${atypeflag}, acName${index}_${subi}, ${value}, ${subitem.data || 'NULL'}},`;
 					subindex++;
 				});
 
@@ -193,10 +193,10 @@ function objectlist_generator(form, od, indexes)
 
 	function subindex_padded(subindex) {
 		// pad with 0 if single digit
-		if (subindex > 9) {
-			return `${subindex}`;
+		if (subindex > 16) {
+		    return subindex.toString(16);
 		}
-		return `0${subindex}`;
+	    return `0${subindex.toString(16)}`;
 	}
 	
 	/** Gets flags for objectlist item: