diff --git a/components/pthreads/pthread.c b/components/pthreads/pthread.c
index c779efed18..59a689a51e 100644
--- a/components/pthreads/pthread.c
+++ b/components/pthreads/pthread.c
@@ -180,10 +180,11 @@ int pthread_detach(pthread_t thread)
 		rt_enter_critical();
 		/* change to detach state */
 		ptd->attr.detachstate = PTHREAD_CREATE_DETACHED;
-		rt_exit_critical();
 
 		/* detach joinable semaphore */
 		rt_sem_delete(ptd->joinable_sem);
+		ptd->joinable_sem = RT_NULL;
+		rt_exit_critical();
 	}
 
 	return 0;
diff --git a/components/pthreads/pthread.h b/components/pthreads/pthread.h
index 58a1bb7423..67d8f62c9f 100644
--- a/components/pthreads/pthread.h
+++ b/components/pthreads/pthread.h
@@ -129,7 +129,7 @@ typedef struct pthread_barrier pthread_barrier_t;
 int pthread_attr_destroy(pthread_attr_t *attr);
 int pthread_attr_init(pthread_attr_t *attr);
 
-int pthread_init (void);
+int pthread_system_init(void);
 int pthread_create (pthread_t *tid, const pthread_attr_t *attr, 
 	void *(*start) (void *), void *arg);