diff --git a/package.json b/package.json
index 71be470..6efd5e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "WorkTime",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "author": "Ionic Framework",
   "homepage": "https://ionicframework.com/",
   "scripts": {
diff --git a/src/app/analysis/analysis.page.html b/src/app/analysis/analysis.page.html
index acc434b..f843e7b 100644
--- a/src/app/analysis/analysis.page.html
+++ b/src/app/analysis/analysis.page.html
@@ -15,11 +15,11 @@
 
   <ion-item>
     <ion-label>Tag</ion-label>
-    <ion-datetime-button datetime="current-datetime"></ion-datetime-button>
+    <ion-datetime-button datetime="current-datetime-analysis"></ion-datetime-button>
 
     <ion-modal [keepContentsMounted]="true">
       <ng-template>
-        <ion-datetime id="current-datetime" presentation="date" [(ngModel)]="currentDate"></ion-datetime>
+        <ion-datetime id="current-datetime-analysis" presentation="date" [(ngModel)]="currentDate" (ngModelChange)="updateCurrentData()"></ion-datetime>
       </ng-template>
     </ion-modal>
   </ion-item>
diff --git a/src/app/analysis/analysis.page.ts b/src/app/analysis/analysis.page.ts
index d464e7c..2ea46e3 100644
--- a/src/app/analysis/analysis.page.ts
+++ b/src/app/analysis/analysis.page.ts
@@ -49,26 +49,12 @@ export class AnalysisPage {
   @ViewChild('chart') chartRef: ElementRef;
   private chart: any;
 
-  private changeListener: any;
-
   constructor(private time: TimeService) {
     addIcons({briefcase, pizza, card})
   }
 
   ionViewDidEnter() {
     this.updateCurrentData();
-
-    let lastDate: any = undefined;
-    this.changeListener = setInterval(() => {
-      if (this.currentDate != lastDate) {
-        lastDate = this.currentDate;
-        this.updateCurrentData();
-      }
-    }, 200)
-  }
-
-  ionViewDidLeave() {
-    clearInterval(this.changeListener);
   }
 
   public updateCurrentData() {