Index: main/channel.c
===================================================================
--- main/channel.c	(revision 287549)
+++ main/channel.c	(working copy)
@@ -5933,9 +5933,10 @@
 	ao2_unlink(channels, original);
 	ao2_unlink(channels, clonechan);
 
+#if 0
 	/* now that both channels are locked and unlinked from the container, it is safe to unlock it */
 	ao2_unlock(channels);
-
+#endif
 	ast_debug(4, "Actually Masquerading %s(%d) into the structure of %s(%d)\n",
 		clonechan->name, clonechan->_state, original->name, original->_state);
 
@@ -6218,6 +6219,7 @@
 		ao2_link(channels, original);
 	}
 
+	ao2_unlock(channels);
 	return 0;
 }