diff --git a/ChangeLog b/ChangeLog
index 5ac7f7f8..20145632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,10 @@ Michael Voigt
   Jackdmp changes log
 ---------------------------
 
+2008-10-15 Stephane Letz  <letz@grame.fr>
+	
+	* Fix a conflict with Audio Hijack in JackCoreAudioDriver. 
+
 2008-10-09 Stephane Letz  <letz@grame.fr>
 	
 	* Use a mutex to make jack_client_open/jack_client_close thread safe, remove use of jack_init/jack_uninit.
diff --git a/macosx/coreaudio/JackCoreAudioDriver.cpp b/macosx/coreaudio/JackCoreAudioDriver.cpp
index f8fd3c92..cf0a94cc 100644
--- a/macosx/coreaudio/JackCoreAudioDriver.cpp
+++ b/macosx/coreaudio/JackCoreAudioDriver.cpp
@@ -197,18 +197,10 @@ OSStatus JackCoreAudioDriver::MeasureCallback(AudioDeviceID inDevice,
 {
     JackCoreAudioDriver* driver = (JackCoreAudioDriver*)inClientData;
     AudioDeviceStop(driver->fDeviceID, MeasureCallback);
-/*
-#ifdef MAC_OS_X_VERSION_10_5
-    AudioDeviceDestroyIOProcID(driver->fDeviceID, driver->fMesureCallbackID);
-#else
-    AudioDeviceRemoveIOProc(driver->fDeviceID, MeasureCallback);
-#endif
-*/
-
-    AudioDeviceRemoveIOProc(driver->fDeviceID, MeasureCallback);
     
     jack_log("JackCoreAudioDriver::MeasureCallback called");
     JackMachThread::GetParams(&driver->fEngineControl->fPeriod, &driver->fEngineControl->fComputation, &driver->fEngineControl->fConstraint);
+    
     // Setup threadded based log function
     set_threaded_log_function();
     return noErr;