diff --git a/api/js/etemplate/et2_core_arrayMgr.js b/api/js/etemplate/et2_core_arrayMgr.js
index 5b6029d423..94ffe714c6 100644
--- a/api/js/etemplate/et2_core_arrayMgr.js
+++ b/api/js/etemplate/et2_core_arrayMgr.js
@@ -209,7 +209,7 @@ var et2_arrayMgr = /** @class */ (function () {
         var pos_var = _ident.indexOf('$');
         if (pos_var >= 0 && (this.perspectiveData.row != null || !_ident.match(/\$\{?row\}?/))) {
             // Get the content array for the current row
-            var row = this.perspectiveData.row || '';
+            var row = typeof this.perspectiveData.row == 'number' ? this.perspectiveData.row : '';
             var row_cont = this.data[row] || {};
             // $cont is NOT root but current name-space in old eTemplate
             var cont = this.data; //getRoot().data;
diff --git a/api/js/etemplate/et2_core_arrayMgr.ts b/api/js/etemplate/et2_core_arrayMgr.ts
index 29e91e47e4..771bec3a0e 100644
--- a/api/js/etemplate/et2_core_arrayMgr.ts
+++ b/api/js/etemplate/et2_core_arrayMgr.ts
@@ -227,7 +227,7 @@ export class et2_arrayMgr
 		const pos_var = _ident.indexOf('$');
 		if (pos_var >= 0 && (this.perspectiveData.row != null || !_ident.match(/\$\{?row\}?/))) {
 			// Get the content array for the current row
-			const row = this.perspectiveData.row || '';
+			const row = typeof this.perspectiveData.row == 'number' ? this.perspectiveData.row : '';
 			const row_cont = this.data[row] || {};
 			// $cont is NOT root but current name-space in old eTemplate
 			const cont = this.data;//getRoot().data;