diff --git a/steps/32/README.md b/steps/32/README.md
index 39fc6fad..3b2e1482 100644
--- a/steps/32/README.md
+++ b/steps/32/README.md
@@ -37,6 +37,7 @@ import Controller from "sap/ui/core/mvc/Controller";
 import Component from "../Component";
 import { Route$PatternMatchedEvent } from "sap/ui/core/routing/Route";
 import History from "sap/ui/core/routing/History";
+import UIComponent from "sap/ui/core/ UIComponent";
 
 /**
  * @namespace ui5.walkthrough.controller
@@ -62,7 +63,7 @@ export default class Detail extends Controller {
         if (previousHash !== undefined) {
             window.history.go(-1);
         } else {
-            const router = (this.getOwnerComponent() as Component).getRouter();
+            const router = UIComponent.getRouterFor(this);
             router.navTo("overview", {}, true);
         }
     }    
diff --git a/steps/32/webapp/controller/Detail.controller.ts b/steps/32/webapp/controller/Detail.controller.ts
index f7aaea6d..016ffd14 100644
--- a/steps/32/webapp/controller/Detail.controller.ts
+++ b/steps/32/webapp/controller/Detail.controller.ts
@@ -2,6 +2,7 @@ import Controller from "sap/ui/core/mvc/Controller";
 import Component from "../Component";
 import { Route$PatternMatchedEvent } from "sap/ui/core/routing/Route";
 import History from "sap/ui/core/routing/History";
+import UIComponent from "sap/ui/core/ UIComponent";
 
 /**
  * @namespace ui5.walkthrough.controller
@@ -27,7 +28,7 @@ export default class Detail extends Controller {
         if (previousHash !== undefined) {
             window.history.go(-1);
         } else {
-            const router = (this.getOwnerComponent() as Component).getRouter();
+            const router = UIComponent.getRouterFor(this);
             router.navTo("overview", {}, true);
         }
     }
diff --git a/steps/33/README.md b/steps/33/README.md
index 6677b78b..89cb1cc0 100644
--- a/steps/33/README.md
+++ b/steps/33/README.md
@@ -310,6 +310,7 @@ import Controller from "sap/ui/core/mvc/Controller";
 import Component from "../Component";
 import { Route$PatternMatchedEvent } from "sap/ui/core/routing/Route";
 import History from "sap/ui/core/routing/History";
+import UIComponent from "sap/ui/core/ UIComponent";
 import MessageToast from "sap/m/MessageToast";
 import ProductRating, { ProductRating$ChangeEvent } from "../control/ProductRating";
 import ResourceBundle from "sap/base/i18n/ResourceBundle";
@@ -341,7 +342,7 @@ export default class Detail extends Controller {
         if (previousHash !== undefined) {
             window.history.go(-1);
         } else {
-            const router = (this.getOwnerComponent() as Component).getRouter();
+            const router = UIComponent.getRouterFor(this);
             router.navTo("overview", {}, true);
         }
     }    
diff --git a/steps/33/webapp/controller/Detail.controller.ts b/steps/33/webapp/controller/Detail.controller.ts
index ca43d5e1..5965a016 100644
--- a/steps/33/webapp/controller/Detail.controller.ts
+++ b/steps/33/webapp/controller/Detail.controller.ts
@@ -2,6 +2,7 @@ import Controller from "sap/ui/core/mvc/Controller";
 import Component from "../Component";
 import { Route$PatternMatchedEvent } from "sap/ui/core/routing/Route";
 import History from "sap/ui/core/routing/History";
+import UIComponent from "sap/ui/core/ UIComponent";
 import MessageToast from "sap/m/MessageToast";
 import ProductRating, { ProductRating$ChangeEvent } from "../control/ProductRating";
 import ResourceBundle from "sap/base/i18n/ResourceBundle";
@@ -33,7 +34,7 @@ export default class Detail extends Controller {
         if (previousHash !== undefined) {
             window.history.go(-1);
         } else {
-            const router = (this.getOwnerComponent() as Component).getRouter();
+            const router = UIComponent.getRouterFor(this);
             router.navTo("overview", {}, true);
         }
     }
diff --git a/steps/35/README.md b/steps/35/README.md
index 1fc3c720..37ff2305 100644
--- a/steps/35/README.md
+++ b/steps/35/README.md
@@ -122,6 +122,7 @@ import Controller from "sap/ui/core/mvc/Controller";
 import Component from "../Component";
 import { Route$PatternMatchedEvent } from "sap/ui/core/routing/Route";
 import History from "sap/ui/core/routing/History";
+import UIComponent from "sap/ui/core/ UIComponent";
 import MessageToast from "sap/m/MessageToast";
 import ProductRating, { ProductRating$ChangeEvent } from "../control/ProductRating";
 import ResourceBundle from "sap/base/i18n/ResourceBundle";
diff --git a/steps/35/webapp/controller/Detail.controller.ts b/steps/35/webapp/controller/Detail.controller.ts
index e229cf2d..150d1697 100644
--- a/steps/35/webapp/controller/Detail.controller.ts
+++ b/steps/35/webapp/controller/Detail.controller.ts
@@ -2,6 +2,7 @@ import Controller from "sap/ui/core/mvc/Controller";
 import Component from "../Component";
 import { Route$PatternMatchedEvent } from "sap/ui/core/routing/Route";
 import History from "sap/ui/core/routing/History";
+import UIComponent from "sap/ui/core/ UIComponent";
 import MessageToast from "sap/m/MessageToast";
 import ProductRating, { ProductRating$ChangeEvent } from "../control/ProductRating";
 import ResourceBundle from "sap/base/i18n/ResourceBundle";
@@ -39,7 +40,7 @@ export default class Detail extends Controller {
         if (previousHash !== undefined) {
             window.history.go(-1);
         } else {
-            const router = (this.getOwnerComponent() as Component).getRouter();
+            const router = UIComponent.getRouterFor(this);
             router.navTo("overview", {}, true);
         }
     }