Index: trunk/core/kernel/event_handler.php
===================================================================
diff -u -r3236 -r3834
--- trunk/core/kernel/event_handler.php	(.../event_handler.php)	(revision 3236)
+++ trunk/core/kernel/event_handler.php	(.../event_handler.php)	(revision 3834)
@@ -153,7 +153,12 @@
 			$pass_events = $event->getEventParam('pass_events');
 					
 			$query_vars = $this->Application->getUnitOption($event->Prefix, 'QueryString');
-//			unset( $query_vars[ array_search('event', $query_vars) ] );
+			
+			$event_key = array_search('event', $query_vars);
+			if ($event_key) {
+				unset($query_vars[$event_key]);
+			}
+			
 			//if pass events is off and event is not implicity passed
 			if ( !$pass_events && !isset($url_params[$prefix_special.'_event']) )
 			{
@@ -249,7 +254,6 @@
 			{
 				$event->status = erFAIL;
 			}
-			
 		}
 	}