diff --git a/src/account.cpp b/src/account.cpp
index e05fafb0fe2c4ab43295434926787dc57557ba9a..6c9a82be1be1f19590a48be3dab198d1ba8f3df8 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -31,7 +31,9 @@ Account::Account(const AccountID& accountID) : _accountID(accountID)
 
 Account::~Account()
 {
-  delete _link; _link = NULL;
+  // _link should be destroyed WHERE IT'S CREATED
+  //delete _link;
+  //_link = NULL;
 }
 
 
diff --git a/src/iaxaccount.cpp b/src/iaxaccount.cpp
index 8241a544b285d1b8e1aadcbbef4b9876fed3179c..7ee53768e0972556c021fc9025f634552aba8362 100644
--- a/src/iaxaccount.cpp
+++ b/src/iaxaccount.cpp
@@ -32,6 +32,7 @@ IAXAccount::IAXAccount(const AccountID& accountID)
 IAXAccount::~IAXAccount()
 {
   delete _link;
+  _link = NULL;
 }
 
 void
diff --git a/src/sipaccount.cpp b/src/sipaccount.cpp
index b277e8eb96e1a44f6cfbe94cb82ad5bb4739d2d2..722943f084c7e69a8e7d0b75bbdae420bb6f2879 100644
--- a/src/sipaccount.cpp
+++ b/src/sipaccount.cpp
@@ -32,6 +32,7 @@ SIPAccount::SIPAccount(const AccountID& accountID)
 SIPAccount::~SIPAccount()
 {
   delete _link;
+  _link = NULL;
 }
 
 void