Index: trunk/kernel/units/selectors/selectors_event_handler.php
===================================================================
diff -u -N -r4685 -r5431
--- trunk/kernel/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 4685)
+++ trunk/kernel/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 5431)
@@ -158,8 +158,7 @@
 		 */
 		function SaveChanges(&$event)
 		{
-			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
-			$object =& $event->getObject();
+			$object =& $event->getObject( Array('skip_autoload' => true) );
 			
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if($items_info)
@@ -352,8 +351,7 @@
 		 */
 		function OnMassResetToBase(&$event)
 		{
-			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
-			$object =& $event->getObject();
+			$object =& $event->getObject( Array('skip_autoload' => true) );
 			
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if($items_info)