diff --git a/src/Entity/Job.php b/src/Entity/Job.php
index 95fb4d4..27d33cf 100644
--- a/src/Entity/Job.php
+++ b/src/Entity/Job.php
@@ -158,13 +158,13 @@ class Job
     {
         $names = is_array($name) ? $name : explode('.', $name);
         $current = $names[0];
-        if(is_array($data[$current])) {
+        if(is_array($data[$current]) && isset($names[1])) {
             unset($names[0]);
             $this->removeDataItem($data[$current], array_values($names));
         } elseif(!isset($data[$current])) {
             return false;
         } else {
-            unset($names[0]);
+            unset($data[$names[0]]);
         }
         return true;
     }