diff --git a/shutdown-test.sh b/shutdown-test.sh
index e413e152..1558a6f2 100644
--- a/shutdown-test.sh
+++ b/shutdown-test.sh
@@ -6,10 +6,10 @@ SHUTDOWN_SERVER2(){
 			ESXI_HOST=${PW_HOST_ADDRESSES[${tmp}]}
 		elif [ "${PW_ESXI_HOST_NAMES[${HOST}]}" != "" ]; then
 			ESXI_HOST=${HOST}
-		elif [ "${PW_HOST_IDRACS[iDS-vMS-Host${HOST}]}" != "" ]; then
+		elif [ "${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}" != "" ]; then
 			ESXI_HOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}
-		elif ([ "${HOST::1}" == "o" ] || [ "${HOST::1}" == "O" ]) && [ "${PW_HOST_IDRACS[OFF-vMS-Host${HOST: -1}]}" != "" ]; then
-			ESXI_HOST=${PW_HOST_IDRACS[OFF-vMS-Host${HOST: -1}]}
+		elif ([ "${HOST::1}" == "o" ] || [ "${HOST::1}" == "O" ]) && [ "${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}" != "" ]; then
+			ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}
 			echo $ESXI_HOST
 		elif [ "${PW_HOST_ADDRESSES[${HOST}]}" != "" ]; then
 			ESXI_HOST=${PW_HOST_ADDRESSES[${HOST}]}