diff --git a/ChangeLog b/ChangeLog
index e0aa2d22..4a55eb73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ Fernando Lopez-Lezcano
 2008-05-13 Stephane Letz  <letz@grame.fr>
 
 	* Fix exception handling in JackShmMem::operator new.
+	* Fix JackMutex constructor.
 
 2008-05-12 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/JackMutex.h b/common/JackMutex.h
index 9d96e157..13b4c7b5 100644
--- a/common/JackMutex.h
+++ b/common/JackMutex.h
@@ -81,9 +81,15 @@ class JackMutex
         {
             // Use recursive mutex
             pthread_mutexattr_t mutex_attr;
-            assert(pthread_mutexattr_init(&mutex_attr) == 0);
-            assert(pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE) == 0);
-            assert(pthread_mutex_init(&fMutex, &mutex_attr) == 0);
+            int res;
+            res = pthread_mutexattr_init(&mutex_attr);
+            assert(res == 0);
+            res = pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
+            assert(res == 0);
+            res = pthread_mutex_init(&fMutex, &mutex_attr);
+            assert(res == 0);
+            pthread_mutexattr_destroy(&mutex_attr);
+            assert(res == 0);
         }
         virtual ~JackMutex()
         {