diff --git a/SQF/dayz_code/actions/player_buildingMaint.sqf b/SQF/dayz_code/actions/player_buildingMaint.sqf
index 2c81f8322..0995c3723 100644
--- a/SQF/dayz_code/actions/player_buildingMaint.sqf
+++ b/SQF/dayz_code/actions/player_buildingMaint.sqf
@@ -100,10 +100,13 @@ if (_proceed) then {
 		dayzDeleteObj = [_objectID,_objectUID];
 		publicVariableServer "dayzDeleteObj";
 
+		// sleep a bit to make sure delete happens before create
+		sleep 1;
+
 		// Publish variables
 		_object setVariable ["CharacterID",_objectCharacterID,true];
-		_object setVariable ["ObjectID",_objectID,true];
-		_object setVariable ["ObjectUID",_objectUID,true];
+		
+		//_object setVariable ["ObjectUID",_objectUID,true];
 		_object setVariable ["OEMPos",_location,true];
 
 		dayzPublishObj = [_objectCharacterID,_object,[_dir,_location],_classname];
diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf
index c294a9917..92bf24928 100644
--- a/SQF/dayz_code/actions/player_upgrade.sqf
+++ b/SQF/dayz_code/actions/player_upgrade.sqf
@@ -107,6 +107,9 @@ if ((count _upgrade) > 0) then {
 			dayzDeleteObj = [_objectID,_objectUID];
 			publicVariableServer "dayzDeleteObj";
 
+			// sleep a bit to make sure delete happens before create
+			sleep 1;
+
 			if (_lockable == 3) then {
 
 				_combination_1 = floor(random 10);
@@ -123,8 +126,8 @@ if ((count _upgrade) > 0) then {
 
 			// Publish variables
 			_object setVariable ["CharacterID",_objectCharacterID,true];
-			_object setVariable ["ObjectID",_objectID,true];
-			_object setVariable ["ObjectUID",_objectUID,true];
+
+			//_object setVariable ["ObjectUID",_objectUID,true];
 			_object setVariable ["OEMPos",_location,true];
 
 			dayzPublishObj = [_objectCharacterID,_object,[_dir,_location],_classname];