diff --git a/Batterie_2/module.php b/Batterie_2/module.php
index 0ff8ac7..b2ed4eb 100644
--- a/Batterie_2/module.php
+++ b/Batterie_2/module.php
@@ -176,33 +176,33 @@ public function RequestAction($Ident, $Value)
 
 
 
-    $batterietyp = GetValue($this->ReadPropertyInteger("Batterietyp"));
+    $batterietyp = $this->ReadPropertyInteger("Batterietyp");
     if ($batterietyp == 1) {//Goodwe
 
         //-----------------------Gooodwee-------------------------------------//
         if($this->GetValue("Is_Peak_Shaving")==true){
 
             if ($power >= 0) {
-                $this->SetValue("Goodwe_EntLadeleistung", $abs($power));       
+                $this->SetValue("Goodwe_EntLadeleistung", abs($power));       
                 $this->SetValue("Laden_Entladen", 11); 
             } else {
-                $this->SetValue("Goodwe_EntLadeleistung", $abs($power));    
+                $this->SetValue("Goodwe_EntLadeleistung", abs($power));    
                 $this->SetValue("Laden_Entladen", 12);               
             }
 
         }else{
 
             if ($power >= 0) {
-                $this->SetValue("Goodwe_EntLadeleistung", $abs($power));      
+                $this->SetValue("Goodwe_EntLadeleistung", abs($power));      
                 $this->SetValue("Laden_Entladen", 11);  
             } else {
-                $this->SetValue("Goodwe_EntLadeleistung", $abs($power));    
+                $this->SetValue("Goodwe_EntLadeleistung", abs($power));    
                 $this->SetValue("Laden_Entladen", 12);              
             }
 
         }
 
-    }elseif (GetValue($this->ReadPropertyInteger("Batterietyp")) == 2) {//Solaredge
+    }elseif ($batterietyp == 2) {//Solaredge
 
             //-----------------------Solaredge-------------------------------------//
         if($this->GetValue("Is_Peak_Shaving")==true){