diff --git a/ChangeLog b/ChangeLog
index 9e0cf57..f50f19f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 Version 1.6.9
 *******************************************************************************
 
+2010-10-20 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
+
+	Fix for bug introduced in samples code in svn revision 502, commit
+	git:25c908c558c8e60eb386c155a6b93add447ffec0
+
+	Sample device and combo were aborting with the message:
+	"***** SampleUtil_Initialize was called multiple times!"
+
 2010-11-08 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
 
 	Make multiple SSDP advertisements faster.
diff --git a/upnp/sample/common/sample_util.c b/upnp/sample/common/sample_util.c
index f2f6afb..e128604 100644
--- a/upnp/sample/common/sample_util.c
+++ b/upnp/sample/common/sample_util.c
@@ -82,9 +82,6 @@ int SampleUtil_Initialize(print_string print_function)
 		ithread_mutex_unlock(&display_mutex);
 
 		initialize_init = 0;
-	} else {
-		SampleUtil_Print("***** SampleUtil_Initialize was called multiple times!\n");
-		abort();
 	}
 
 	return UPNP_E_SUCCESS;