diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py
index 1ca54e0..c80fbb9 100644
--- a/NeoBoot/extract.py
+++ b/NeoBoot/extract.py
@@ -758,7 +758,9 @@ def RemoveUnpackDirs():
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/multibox ' + getNeoLocation() + 'ImagesUpload/multibox; rm -r ' + getNeoLocation() + 'ImagesUpload/multibox')
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/octagon/sf8008'):
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/usb_update.bin ' + getNeoLocation() + 'ImagesUpload/octagon; rm -r ' + getNeoLocation() + 'ImagesUpload/octagon')
-    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h7'):
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/octagon/sf8008m'):
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/octagon')
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h7'):
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/bootargs.bin ' + getNeoLocation() + 'ImagesUpload/h7; mv ' + getNeoLocation() + 'ImagesUpload/fastboot.bin ' + getNeoLocation() + 'ImagesUpload/h7')
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/h7')
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h9'):