diff --git a/src/Core/IUI.js b/src/Core/IUI.js
index 5904d09..57e7fb7 100644
--- a/src/Core/IUI.js
+++ b/src/Core/IUI.js
@@ -359,8 +359,10 @@ export class IUI {
                 // @TODO should check if the element depends on parent or not
                 if (el.dataMap != null) {
                     // if map function failed to call setData, we will render without it
-                    if (!(await el.dataMap.render(data)))
-                        await el.render();
+                    if (!(await el.dataMap.render(data))){
+						// @BUG @TODO this causes stackoverflow
+						// await el.render();
+					}
                 }
                 else {
                     await el.setData(data);
diff --git a/src/Data/Repeat.js b/src/Data/Repeat.js
index 723aaa9..30a17d7 100644
--- a/src/Data/Repeat.js
+++ b/src/Data/Repeat.js
@@ -166,8 +166,10 @@ export default IUI.module(class Repeat extends IUIElement
                 // @TODO should check if the element depends on parent or not
                 if (el.dataMap != null) {
                     // if map function failed to call setData, we will render without it
-                    if (!(await el.dataMap.render(value[i])))
-                        await el.render();
+                    if (!(await el.dataMap.render(value[i]))) {
+						// @BUG @TODO this causes stackoverflow
+						// await el.render();
+                    }
                 }
                 else {
                     await el.setData(value[i]);
diff --git a/src/Router/Router.js b/src/Router/Router.js
index f74012f..b68a0e1 100644
--- a/src/Router/Router.js
+++ b/src/Router/Router.js
@@ -210,8 +210,10 @@ export default IUI.module(
       try {
           if (stateRoute.dataMap != null) {
             // if map function failed to call setData, we will render without it
-            if (!(await stateRoute.dataMap.render(data || {})))
-              await stateRoute.render();
+            if (!(await stateRoute.dataMap.render(data || {}))){
+              // @BUG @TODO this causes stackoverflow
+              // await stateRoute.render();
+            }
 
             if (viewRoute != stateRoute) await viewRoute.setData(stateRoute.data);
           } //if (data !== undefined)