diff --git a/batime@martin.zurowietz.de/extension.js b/batime@martin.zurowietz.de/extension.js
index 0ff8ad9..8a99e5c 100644
--- a/batime@martin.zurowietz.de/extension.js
+++ b/batime@martin.zurowietz.de/extension.js
@@ -8,14 +8,14 @@ class BaTimeExtension {
       this.originalIndicator = this.aggregateMenu._power;
       this.customIndicator = new BaTime.imports.power.Indicator();
       this.aggregateMenu._indicators.replace_child(
-         this.originalIndicator.indicators,
-         this.customIndicator.indicators
+         this.originalIndicator,
+         this.customIndicator
       );
    }
    destroy() {
       this.aggregateMenu._indicators.replace_child(
-         this.customIndicator.indicators,
-         this.originalIndicator.indicators
+         this.customIndicator,
+         this.originalIndicator
       );
    }
 }
diff --git a/batime@martin.zurowietz.de/metadata.json b/batime@martin.zurowietz.de/metadata.json
index e0c809e..00022d1 100644
--- a/batime@martin.zurowietz.de/metadata.json
+++ b/batime@martin.zurowietz.de/metadata.json
@@ -1,6 +1,6 @@
 
 {
-  "shell-version": ["3.28", "3.30", "3.32", "3.34"],
+  "shell-version": ["3.36"],
   "uuid": "batime@martin.zurowietz.de",
   "url": "https://github.com/mzur/gnome-shell-batime",
   "settings-schema": "org.gnome.shell.extensions.batime",
diff --git a/batime@martin.zurowietz.de/power.js b/batime@martin.zurowietz.de/power.js
index dbbb8c0..7e271b9 100644
--- a/batime@martin.zurowietz.de/power.js
+++ b/batime@martin.zurowietz.de/power.js
@@ -1,8 +1,10 @@
+const { GObject} = imports.gi;
 const Lang = imports.lang;
 const UPower = imports.gi.UPowerGlib;
 const BaseIndicator = imports.ui.status.power.Indicator;
 
-var Indicator = class extends BaseIndicator {
+var Indicator = GObject.registerClass(
+   class Indicator extends BaseIndicator {
    // Adapted from _getStatus of the parent.
    _getTime() {
       let seconds = 0;
@@ -36,4 +38,4 @@ var Indicator = class extends BaseIndicator {
       super._sync();
       this._percentageLabel.clutter_text.set_markup('<span size="smaller">' + this._getTime() + '</span>');
    }
-}
+});