4 files changed, 20 insertions, 9 deletions
diff --git a/dev/kernel/src/FS/HeFS.cc b/dev/kernel/src/FS/HeFS.cc
index 8d73b61e..2269896f 100644
--- a/dev/kernel/src/FS/HeFS.cc
+++ b/dev/kernel/src/FS/HeFS.cc
@@ -141,11 +141,22 @@ namespace Kernel
 
 					start = dir->fNext;
 
-					if (start == 0)
-						start = dir->fChild;
-
-					if (start == 0)
-						start = dir->fParent;
+					if (dir->fColor == kHeFSBlack)
+					{
+						if (dir->fParent != 0)
+							start = dir->fParent;
+					}
+					else
+					{
+						if (dir->fChild != 0)
+							start = dir->fChild;
+						else if (dir->fNext != 0)
+							start = dir->fNext;
+						else if (dir->fPrev != 0)
+							start = dir->fPrev;
+						else
+							start = dir->fParent;
+					}
 				}
 
 				delete dir;
@@ -173,7 +184,7 @@ namespace Kernel
 			NE_UNUSED(mnt);
 			NE_UNUSED(parent_dir_name);
 			NE_UNUSED(node);
-			
+
 			return NO;
 		}
 	} // namespace Detail
diff --git a/dev/kernel/src/FS/NeFS.cc b/dev/kernel/src/FS/NeFS.cc
index 115e4c82..e8e3804c 100644
--- a/dev/kernel/src/FS/NeFS.cc
+++ b/dev/kernel/src/FS/NeFS.cc
@@ -460,7 +460,7 @@ _Output Bool NeFileSystemParser::FormatGPT(_Input _Output DriveTrait* drive, _In
 	NE_UNUSED(end_lba);
 	NE_UNUSED(flags);
 	NE_UNUSED(part_name);
-	
+
 	(void)(kout << "FormatGPT: Not implemented yet.\r");
 
 	return NO;
diff --git a/dev/kernel/src/UserProcessScheduler.cc b/dev/kernel/src/UserProcessScheduler.cc
index b45294b3..e96d2b27 100644
--- a/dev/kernel/src/UserProcessScheduler.cc
+++ b/dev/kernel/src/UserProcessScheduler.cc
@@ -428,7 +428,7 @@ namespace Kernel
 		{
 			return;
 		}
-		
+
 		mTeam.mProcessList[process_id].Exit(0);
 	}
 
diff --git a/dev/kernel/src/Utils.cc b/dev/kernel/src/Utils.cc
index 399be317..f5e61ddf 100644
--- a/dev/kernel/src/Utils.cc
+++ b/dev/kernel/src/Utils.cc
@@ -42,7 +42,7 @@ namespace Kernel
 
 		return len;
 	}
-	
+
 	Size rt_string_len(const Char* ptr)
 	{
 		SizeT cnt{0};