diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 09a6ba1fe..b627147d3 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -914,6 +914,7 @@ ZWave_Cmd($$@)
   my %cmdList;
   my $classes = AttrVal($name, "classes", "");
   foreach my $cl (split(" ", $classes)) {
+    last if($cl eq "MARK");
     my $ptr = ZWave_getHash($hash, $cl, $type);
     next if(!$ptr);
 
@@ -2285,7 +2286,7 @@ ZWave_mfsAddClasses($$)
       $id = sprintf("%02x", $id);
       my $cn = $zwave_id2class{$id};
       next if($attr =~ m/$cn/);
-      $attr .= " $cn";
+      $attr = "$cn ".$attr;
       $changed = 1;
     }
   }