diff --git a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
index 2453142e..06a18339 100644
--- a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
+++ b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
@@ -353,6 +353,7 @@ public class ActivityControlCenter extends Activity
         systemInfoText.append("Device details" + Miscellaneous.lineSeparator);
         systemInfoText.append("OS version: " + System.getProperty("os.version") + Miscellaneous.lineSeparator);
         systemInfoText.append("API Level: " + android.os.Build.VERSION.SDK + Miscellaneous.lineSeparator);
+        systemInfoText.append("Target SDK: " + Miscellaneous.getAnyContext().getApplicationInfo().targetSdkVersion + Miscellaneous.lineSeparator);
         systemInfoText.append("Device: " + android.os.Build.DEVICE + Miscellaneous.lineSeparator);
         systemInfoText.append("Model: " + android.os.Build.MODEL + Miscellaneous.lineSeparator);
         systemInfoText.append("Product: " + android.os.Build.PRODUCT + Miscellaneous.lineSeparator);
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageRule.java b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
index 21a96c6d..4c6b5ac3 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageRule.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
@@ -127,7 +127,7 @@ public class ActivityManageRule extends Activity
 	final static int requestCodeActionRunExecutableEdit = 814;
 	final static int requestCodeActionSetWifiAdd = 815;
 	final static int requestCodeActionSetWifiEdit = 816;
-	
+
 	public static ActivityManageRule getInstance()
 	{
 		if(instance == null)
@@ -1392,8 +1392,18 @@ public class ActivityManageRule extends Activity
 		{
 			if(resultCode == RESULT_OK)
 			{
-				newTrigger = ActivityManageTriggerNotification.resultingTrigger;
-				newTrigger.setParentRule(ruleToEdit);
+				Trigger editedTrigger = new Trigger();
+				editedTrigger.setTriggerType(Trigger_Enum.notification);
+				editedTrigger.setTriggerParameter(data.getBooleanExtra(ActivityManageTriggerNotification.intentNameNotificationDirection, false));
+				editedTrigger.setTriggerParameter2(
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationApp) + Trigger.triggerParameter2Split +
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationTitleDir) + Trigger.triggerParameter2Split +
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationTitle) + Trigger.triggerParameter2Split +
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationTextDir) + Trigger.triggerParameter2Split +
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationText)
+				);
+				editedTrigger.setParentRule(ruleToEdit);
+				ruleToEdit.getTriggerSet().set(editIndex, editedTrigger);
 				this.refreshTriggerList();
 			}
 		}
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java
index 63087c79..bc93f10a 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java
@@ -322,23 +322,14 @@ public class ActivityManageTriggerNotification extends Activity
 				String textDir = Trigger.getMatchCode(spinnerTextDirection.getSelectedItem().toString());
 				String text = etNotificationText.getText().toString();
 
-				if(edit)
-				{
-					editedNotificationTrigger.setTriggerParameter(chkNotificationDirection.isChecked());
-					editedNotificationTrigger.setTriggerParameter2(app + triggerParameter2Split + titleDir + triggerParameter2Split + title + triggerParameter2Split + textDir + triggerParameter2Split + text);
-					ActivityManageTriggerNotification.this.setResult(RESULT_OK);
-				}
-				else
-				{
-					Intent data = new Intent();
-					data.putExtra(intentNameNotificationDirection, chkNotificationDirection.isChecked());
-					data.putExtra(intentNameNotificationApp, app);
-					data.putExtra(intentNameNotificationTitleDir, titleDir);
-					data.putExtra(intentNameNotificationTitle, title);
-					data.putExtra(intentNameNotificationTextDir, textDir);
-					data.putExtra(intentNameNotificationText, text);
-					ActivityManageTriggerNotification.this.setResult(RESULT_OK, data);
-				}
+				Intent data = new Intent();
+				data.putExtra(intentNameNotificationDirection, chkNotificationDirection.isChecked());
+				data.putExtra(intentNameNotificationApp, app);
+				data.putExtra(intentNameNotificationTitleDir, titleDir);
+				data.putExtra(intentNameNotificationTitle, title);
+				data.putExtra(intentNameNotificationTextDir, textDir);
+				data.putExtra(intentNameNotificationText, text);
+				ActivityManageTriggerNotification.this.setResult(RESULT_OK, data);
 
 				finish();
 			}
diff --git a/fastlane/metadata/android/en-US/changelogs/120.txt b/fastlane/metadata/android/en-US/changelogs/120.txt
index 1043b2bc..34117212 100644
--- a/fastlane/metadata/android/en-US/changelogs/120.txt
+++ b/fastlane/metadata/android/en-US/changelogs/120.txt
@@ -1,5 +1,7 @@
 * New trigger: device has just started
 * New trigger: service has just started
-* New parameter for trigger Screen state: New state "locked"
 * New trigger: Respond to customizable broadcasts
-* New action: Send broadcasts
\ No newline at end of file
+* New parameter for trigger Screen state: New state "locked"
+* New action: Send broadcasts
+* Fixed: Crash when editing notification trigger
+* Fixed: TimeFrame trigger - time may have changed when crossing timezones
\ No newline at end of file