diff --git a/app/src/main/java/com/jens/automation2/receivers/CalendarReceiver.java b/app/src/main/java/com/jens/automation2/receivers/CalendarReceiver.java
index e0b00d7f..e6900c8b 100644
--- a/app/src/main/java/com/jens/automation2/receivers/CalendarReceiver.java
+++ b/app/src/main/java/com/jens/automation2/receivers/CalendarReceiver.java
@@ -65,6 +65,8 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
 
     public static void addUsedPair(RuleEventPair pair)
     {
+        //TODO: Rule with multiple calendar events should be executed only once
+
         // Add pair only if it's not in the list already.
         for(RuleEventPair usedPair : calendarEventsUsed)
         {
@@ -621,7 +623,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
 
             for(Trigger t : rule.getTriggerSet())
             {
-                if(t.getTriggerType().equals(calendarEvents))
+                if(t.getTriggerType().equals(Trigger.Trigger_Enum.calendarEvent))
                 {
                     for (CalendarReceiver.CalendarEvent event : calendarEvents)
                     {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8029fac6..eb0817d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -939,5 +939,5 @@
     <string name="reoccurringFalse">event is not reoccurring</string>
     <string name="reoccurringTrue">event is reoccurring</string>
     <string name="reoccurring">reoccurring</string>
-    <string name="calendarTriggerExecutionHints">If your calendar holds multiple events in parallel, a rule would get executed as many time as there are events. The same goes for eventsthat directly follow each other.</string>
+    <string name="calendarTriggerExecutionHints">If your calendar holds multiple events in parallel, a rule would get executed as many time as there are events matching the rule\'s criteria. Also for events that directly follow each other a rule with a matching event trigger would get executed twice.\nOnly in case a rule has multiple calendar triggers and there are multiple matching events in parallel the rule will get executed only once.</string>
 </resources>
\ No newline at end of file