diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 39a842ca0..6cbe1c24a 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -2784,7 +2784,7 @@ ZWave_Parse($$@)
     my @vals = ("learnReady", "nodeFound", "slave",
                 "controller", "protocolDone", "done", "failed");
     $evt = ($id eq "00" || hex($id)>@vals+1) ? "unknownArg" : $vals[hex($id)-1];
-    if($evt eq "slave" &&
+    if(($evt eq "slave" || $evt eq "controller") &&
        $arg =~ m/(..)....(..)..(.*)$/) {
       my ($id,$type6,$classes) = ($1, $2, $3);
       return ZWave_SetClasses($homeId, $id, $type6, $classes)