diff --git a/src/HasParent.php b/src/HasParent.php
index 0019116..860cf00 100644
--- a/src/HasParent.php
+++ b/src/HasParent.php
@@ -149,19 +149,12 @@ protected function getParentClass(): string
      */
     public function getFillable()
     {
-        // @todo currently failing when parent class is abstract
-        // $parentFillable = (new \ReflectionClass((new \ReflectionClass($this))->getParentClass()));
-        // if ($parentFillable->isAbstract()) {
-        //     return ['*'];
-        // }
-
-        try {
-            $parentClass = $this->getParentClass();
-            $parentFillable = (new $parentClass)->getFillable();
-            $arr = array_unique(array_merge($parentFillable, $this->fillable));
-            return $arr;
-        } catch (\Throwable $th) {
+
+        $parentClass = $this->getParentClass();
+        if ((new ReflectionClass($parentClass))->isAbstract()) {
             return $this->fillable;
         }
+        $parentFillable = (new $parentClass)->getFillable();
+        return array_unique(array_merge($parentFillable, $this->fillable));
     }
 }
diff --git a/tests/Features/ChildModelFillablesMergeWithParentModelFillablesTest.php b/tests/Features/ChildModelFillablesMergeWithParentModelFillablesTest.php
new file mode 100644
index 0000000..8eff61b
--- /dev/null
+++ b/tests/Features/ChildModelFillablesMergeWithParentModelFillablesTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Parental\Tests\Features;
+
+use Parental\Tests\Models\Event;
+use Parental\Tests\Models\Workshop;
+use Parental\Tests\TestCase;
+
+class ChildModelFillablesMergeWithParentModelFillablesTest extends TestCase
+{
+    /** @test */
+    function child_fillables_are_merged_with_parent_fillables()
+    {
+        $workshop = Workshop::create([
+            'name' => 'Scaling Laravel',
+            'industry' => 'Technology',
+            'skill_level' => 'Advanced',
+        ]);
+        $event = Event::first();
+        $this->assertEquals($event->name, $workshop->name);
+    }
+}
diff --git a/tests/Models/Conference.php b/tests/Models/Conference.php
new file mode 100644
index 0000000..8837843
--- /dev/null
+++ b/tests/Models/Conference.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Parental\Tests\Models;
+
+use Parental\HasParent;
+
+class Conference extends Event
+{
+    use HasParent;
+    protected $fillable = ['industry'];
+}
diff --git a/tests/Models/Event.php b/tests/Models/Event.php
new file mode 100644
index 0000000..b4ec4fd
--- /dev/null
+++ b/tests/Models/Event.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Parental\Tests\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Event extends Model
+{
+    protected $fillable = [
+        'name', 'type'
+    ];
+}
diff --git a/tests/Models/Workshop.php b/tests/Models/Workshop.php
new file mode 100644
index 0000000..041a01e
--- /dev/null
+++ b/tests/Models/Workshop.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Parental\Tests\Models;
+
+use Parental\HasParent;
+
+class Workshop extends Event
+{
+    use HasParent;
+    protected $fillable = ['industry', 'skill_level'];
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index a1b0e60..691a48d 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -110,5 +110,14 @@ public function runMigrations()
             $table->string('type')->nullable();
             $table->timestamps();
         });
+
+        Schema::create('events', function ($table) {
+            $table->increments('id');
+            $table->string('type')->nullable();
+            $table->string('name');
+            $table->string('industry')->nullable();
+            $table->string('skill_level')->nullable();
+            $table->timestamps();
+        });
     }
 }