--- apps/app_meetme.1.89.c	2005-03-20 17:14:58.584422916 -0700
+++ apps/app_meetme.c	2005-03-20 17:29:37.874133425 -0700
@@ -964,7 +964,7 @@
 			}
 
 			/* trying to add moh for single person conf */
-			if ((confflags & CONFFLAG_MOH) && !( confflags & CONFFLAG_WAITMARKED)) {
+			if (confflags & CONFFLAG_MOH)  {
 				if (conf->users == 1) {
 					if (musiconhold == 0) {
 						ast_moh_start(chan, NULL);
@@ -979,7 +979,7 @@
 			}
 			
 			/* Leave if the last marked user left */
-			if (currentmarked == 0 && (confflags & CONFFLAG_MARKEDEXIT)) {
+			if (currentmarked == 0 && lastmarked != 0 && (confflags & CONFFLAG_MARKEDEXIT)) {
 				ret = -1;
 				break;
 			}