diff --git a/code/userprog/userthread.cc b/code/userprog/userthread.cc
index 2daf75f..8565913 100644
--- a/code/userprog/userthread.cc
+++ b/code/userprog/userthread.cc
@@ -56,5 +56,9 @@ int do_ThreadCreate(int f, int arg){
 }
 
 void do_ThreadExit(){
+    DEBUG('x', "Enter do_ThreadExit function\n");
+    // TODO: what should we do with thread space?
+    //       Probalely desallocate it...
+    currentThread->Finish();
 }
 #endif