diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py
index 376dbf5..20979c8 100644
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py
@@ -23,6 +23,7 @@ from __future__ import with_statement
 #  2.2   - Fixes for Macs with bonded ethernet ports
 #          Also removed old .kinfo file support (pre-2011)
 #  2.3   - Added more field names thanks to concavegit's KFX code.
+#  2.4   - Fix for complex Mac disk setups, thanks to Tibs
 
 
 """
@@ -30,7 +31,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '2.3'
+__version__ = '2.4'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -1267,7 +1268,7 @@ elif isosx:
         for j in xrange(cnt):
             resline = reslst[j]
             if resline.startswith('/dev'):
-                (devpart, mpath) = resline.split(' on ')
+                (devpart, mpath) = resline.split(' on ')[:2]
                 dpart = devpart[5:]
                 names.append(dpart)
         return names
diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py
index 376dbf5..20979c8 100644
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py
+++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py
@@ -23,6 +23,7 @@ from __future__ import with_statement
 #  2.2   - Fixes for Macs with bonded ethernet ports
 #          Also removed old .kinfo file support (pre-2011)
 #  2.3   - Added more field names thanks to concavegit's KFX code.
+#  2.4   - Fix for complex Mac disk setups, thanks to Tibs
 
 
 """
@@ -30,7 +31,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '2.3'
+__version__ = '2.4'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -1267,7 +1268,7 @@ elif isosx:
         for j in xrange(cnt):
             resline = reslst[j]
             if resline.startswith('/dev'):
-                (devpart, mpath) = resline.split(' on ')
+                (devpart, mpath) = resline.split(' on ')[:2]
                 dpart = devpart[5:]
                 names.append(dpart)
         return names
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin.zip b/DeDRM_calibre_plugin/DeDRM_plugin.zip
index b1388da..a2ea798 100644
Binary files a/DeDRM_calibre_plugin/DeDRM_plugin.zip and b/DeDRM_calibre_plugin/DeDRM_plugin.zip differ
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py b/DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py
index 376dbf5..20979c8 100644
--- a/DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py
@@ -23,6 +23,7 @@ from __future__ import with_statement
 #  2.2   - Fixes for Macs with bonded ethernet ports
 #          Also removed old .kinfo file support (pre-2011)
 #  2.3   - Added more field names thanks to concavegit's KFX code.
+#  2.4   - Fix for complex Mac disk setups, thanks to Tibs
 
 
 """
@@ -30,7 +31,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '2.3'
+__version__ = '2.4'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -1267,7 +1268,7 @@ elif isosx:
         for j in xrange(cnt):
             resline = reslst[j]
             if resline.startswith('/dev'):
-                (devpart, mpath) = resline.split(' on ')
+                (devpart, mpath) = resline.split(' on ')[:2]
                 dpart = devpart[5:]
                 names.append(dpart)
         return names
diff --git a/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw b/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
index 376dbf5..20979c8 100644
--- a/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
+++ b/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
@@ -23,6 +23,7 @@ from __future__ import with_statement
 #  2.2   - Fixes for Macs with bonded ethernet ports
 #          Also removed old .kinfo file support (pre-2011)
 #  2.3   - Added more field names thanks to concavegit's KFX code.
+#  2.4   - Fix for complex Mac disk setups, thanks to Tibs
 
 
 """
@@ -30,7 +31,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '2.3'
+__version__ = '2.4'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -1267,7 +1268,7 @@ elif isosx:
         for j in xrange(cnt):
             resline = reslst[j]
             if resline.startswith('/dev'):
-                (devpart, mpath) = resline.split(' on ')
+                (devpart, mpath) = resline.split(' on ')[:2]
                 dpart = devpart[5:]
                 names.append(dpart)
         return names