diff --git a/ChangeLog.txt b/ChangeLog.txt
index b6f355d67..bcfaf8087 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -596,6 +596,8 @@
 	  for a long time (2013-6-23).
 	* apps/examplex/nxhello:  Correct default colors when in Y1 code mode.
 	  (2013-6-24).
-	* system/Make.defs and Kconfig:  The RAM test was not correctly built
+	* apps/system/Make.defs and Kconfig:  The RAM test was not correctly built
 	  into the configuration and build system (2013-6-26).
-
+	* apps/examples/composite/composite_main.c:  SourceForge But Ticket #19.
+	  Change to prevent some false alarm debug assertions (From Chia Cheng
+	  Tao, 2013-7-9).
diff --git a/examples/composite/composite_main.c b/examples/composite/composite_main.c
index b965eacb7..9ce30cc44 100644
--- a/examples/composite/composite_main.c
+++ b/examples/composite/composite_main.c
@@ -600,8 +600,7 @@ int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev)
 
 void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev)
 {
-  DEBUGASSERT(g_composite.mschandle != NULL &&
-              g_composite.mschandle == (FAR void *)classdev);
+  DEBUGASSERT(g_composite.mschandle != NULL);
   usbmsc_uninitialize(g_composite.mschandle);
 }