diff --git a/FHEM/10_FS20.pm b/FHEM/10_FS20.pm
index 7dc8e7f6f..e6a4d14df 100755
--- a/FHEM/10_FS20.pm
+++ b/FHEM/10_FS20.pm
@@ -250,7 +250,10 @@ FS20_Set($@)
     $lh->{READINGS}{state}{TIME} = $tn;
     $lh->{READINGS}{state}{VAL} = $v;
     my $lhname = $lh->{NAME};
-    DoTrigger($lhname, undef) if($name ne $lhname);
+    if($name ne $lhname) {
+Log 1, "Secondary trigger: $lhname / $name";
+      DoTrigger($lhname, undef)
+    }
   }
   return $ret;
 }
diff --git a/fhem.pl b/fhem.pl
index 8a128cd82..8b96cedf6 100755
--- a/fhem.pl
+++ b/fhem.pl
@@ -2598,7 +2598,7 @@ ReplaceEventMap($$$)
 
   if($changed) {
     my @arr = split(" ",$nstr);
-    push @arr, $dname;
+    unshift @arr, $dname;
     return @arr;
   } else {
     unshift @{$str}, $dname;