diff --git a/src/platform/pte.rs b/src/platform/pte.rs
index cace946aa2844b0a074248d9db6904096f3d3edf..b311726d8a54cbc0257ec8dff8d3329edf608bc4 100644
--- a/src/platform/pte.rs
+++ b/src/platform/pte.rs
@@ -63,27 +63,31 @@ pub unsafe extern "C" fn pte_osThreadCreate(
     ppte_osThreadHandle: *mut pte_osThreadHandle,
 ) -> pte_osResult {
     // XXX error handling
-    let id = Sys::pte_clone();
-    if id < 0 {
-        return PTE_OS_GENERAL_FAILURE;
-    }
 
-    let mutex = Box::into_raw(Box::new(0));
-
-    if id == 0 {
-        // Wait until pte_osThreadStart
-        pte_osMutexLock(mutex);
-        entryPoint(argv);
-        pte_osThreadExit();
-    } else {
-        pte_osMutexLock(&mut pid_mutexes_lock);
-        if pid_mutexes.is_none() {
-            pid_mutexes = Some(BTreeMap::new());
+    // Create a locked mutex, unlocked by pte_osThreadStart
+    let mutex = Box::into_raw(Box::new(2));
+    {
+        let id = Sys::pte_clone();
+        if id < 0 {
+            return PTE_OS_GENERAL_FAILURE;
+        }
+
+        if id == 0 {
+            // Wait until pte_osThreadStart
+            pte_osMutexLock(mutex);
+            entryPoint(argv);
+            pte_osThreadExit();
+        } else {
+            pte_osMutexLock(&mut pid_mutexes_lock);
+            if pid_mutexes.is_none() {
+                pid_mutexes = Some(BTreeMap::new());
+            }
+            pid_mutexes.as_mut().unwrap().insert(id, mutex);
+            pte_osMutexUnlock(&mut pid_mutexes_lock);
+            *ppte_osThreadHandle = id;
         }
-        pid_mutexes.as_mut().unwrap().insert(id, mutex);
-        pte_osMutexUnlock(&mut pid_mutexes_lock);
-        *ppte_osThreadHandle = id;
     }
+
     PTE_OS_OK
 }