diff --git a/src/audio/audiofile.cpp b/src/audio/audiofile.cpp
index 93e0bbb2bd199d77457e14502350bd46c9fe937c..d06fe1745716920704ce83058ec37f1532b8f811 100644
--- a/src/audio/audiofile.cpp
+++ b/src/audio/audiofile.cpp
@@ -25,7 +25,6 @@
 #include <fstream>
 #include <math.h>
 #include <samplerate.h>
-#include <dlfcn.h>
 
 AudioFile::AudioFile()
  : AudioLoop()
@@ -36,7 +35,6 @@ AudioFile::AudioFile()
 
 AudioFile::~AudioFile()
 {
-   delete  _codec;
 }
 
 // load file in mono format
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 70195360dd32fefa5237554175b6fb975bafe462..bc488f1acee67a19ddc8daa2eb41a0bb23f2cbdb 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -909,20 +909,20 @@ ManagerImpl::ringtone()
   int sampleRate  = audiolayer->getSampleRate();
   AudioCodec* codecForTone = _codecDescriptorMap.getFirstCodecAvailable();
 
-  //_toneMutex.enterMutex(); 
- // bool loadFile = _audiofile.loadFile(ringchoice, codecForTone , sampleRate);
-  //_toneMutex.leaveMutex(); 
-  //if (loadFile) {
-    //_toneMutex.enterMutex(); 
-    //_audiofile.start();
-    //_toneMutex.leaveMutex(); 
-    //int size = _audiofile.getSize();
-    //SFLDataFormat output[ size ];
-    //_audiofile.getNext(output, size , 100);
-    //audiolayer->putUrgent( output , size );
-  //} else {
+  _toneMutex.enterMutex(); 
+  bool loadFile = _audiofile.loadFile(ringchoice, codecForTone , sampleRate);
+  _toneMutex.leaveMutex(); 
+  if (loadFile) {
+    _toneMutex.enterMutex(); 
+    _audiofile.start();
+    _toneMutex.leaveMutex(); 
+    int size = _audiofile.getSize();
+    SFLDataFormat output[ size ];
+    _audiofile.getNext(output, size , 100);
+    audiolayer->putUrgent( output , size );
+  } else {
     ringback();
-  //}
+  }
 }
 
   AudioLoop*