diff --git a/CHANGELOG.md b/CHANGELOG.md
index 584de99be8cbcc3350c892f068579d4439668227..5b47cede6b2eca52157ccc074e15ca739b35b4ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 2.1.3
 
+* Had to revert some of the changes fromt he last release... KissAbstract now uses include again and kind_of should now work (unit test added to confirm).
+
 ## 2.1.2
 
 * KissAbstract now extends Kiss::Kiss rather than just including it (so kind_of will work).
diff --git a/lib/kiss/kiss_abstract.rb b/lib/kiss/kiss_abstract.rb
index bbb4924dd68f3a73ef27297588134f4033fe995a..9ac88cc125d5be85462ba399cb2bdea9e018fddd 100644
--- a/lib/kiss/kiss_abstract.rb
+++ b/lib/kiss/kiss_abstract.rb
@@ -5,7 +5,7 @@ require 'kiss/kiss'
 
 module Kiss
     class KissAbstract
-        extend Kiss
+        include Kiss
         include Abstractify::Abstract
 
         abstract :write_interface, :read_interface, :connect, :close
diff --git a/spec/kiss/kiss_serial_spec.rb b/spec/kiss/kiss_serial_spec.rb
index 5826d1c076a884703e1c9f346e7495b916744e8b..bc5d08fb5f5fd014326238f8d2a6314cc6a93d88 100644
--- a/spec/kiss/kiss_serial_spec.rb
+++ b/spec/kiss/kiss_serial_spec.rb
@@ -190,7 +190,7 @@ describe Kiss::KissSerial do
     context "Given the Kiss module as an argument" do
       let( :kiss_serial ) { Kiss::KissSerial.new("/dev/ttyUSB-scs") }
       it "will return true" do
-        expect(kiss_serial.class).to be_kind_of(Kiss::Kiss)
+        expect(kiss_serial).to be_kind_of(Kiss::Kiss)
       end
     end
   end