diff --git a/Fix-AteraAgent.ps1 b/Fix-AteraAgent.ps1
index 08862e9..940fa07 100644
--- a/Fix-AteraAgent.ps1
+++ b/Fix-AteraAgent.ps1
@@ -1,11 +1,20 @@
+$FolderToRename = "${Env:ProgramFiles}\ATERA Networks\AteraAgent\Packages\AgentPackageMonitoring"
+$RenameSuffix = "-Old"
+$FolderNewName = "${FolderToRename}${RenameSuffix}"
+
 LogMsg "Stopping Atera agent"
 Stop-Service -Name AteraAgent -Force
 
-LogMsg "Deleting ${Env:ProgramFiles}\ATERA Networks\AteraAgent\Packages\AgentPackageMonitoring"
-Rename-Item "${Env:ProgramFiles}\ATERA Networks\AteraAgent\Packages\AgentPackageMonitoring" "${Env:ProgramFiles}\ATERA Networks\AteraAgent\Packages\AgentPackageMonitoring-Old"
+If ( Test-Path $FolderNewName ) {
+    LogMsg "Deleting previously renamed folder: ${FolderNewName}"
+    Remove-Item $FolderNewName -Recurse -Force
+}
+
+LogMsg "Deleting ${FolderToRename}"
+Rename-Item $FolderToRename $FolderNewName
 
 LogMsg "Starting Atera agent"
 Start-Service -Name AteraAgent
 
-LogMsg "Forcefully ending all reg.exe and conhost.exe processes"
-Get-Process | Where { ($_.Name -like 'reg') -or ($_.Name -like 'conhost') } | Stop-Process -Force
\ No newline at end of file
+#LogMsg "Forcefully ending all reg.exe and conhost.exe processes"
+#Get-Process | Where { ($_.Name -like 'reg') -or ($_.Name -like 'conhost') } | Stop-Process -Force
\ No newline at end of file