diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 258f814b548..b323b7dec1a 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2547,7 +2547,9 @@
 													listAll: true
 												},
 												success: function(json) {												  
-													var item = json.listpublicipaddressesresponse.publicipaddress[0];													
+													//var item = json.listpublicipaddressesresponse.publicipaddress[0];	//uncomment this line and delete the following line when "listPublicIpAddresses&id=N" is fixed to return a record.	
+                          var item = args.context.ipAddresses[0];
+													
 													args.context.ipAddresses.shift(); //remove the first element in args.context.ipAddresses										
 													args.context.ipAddresses.push(item);
 																										
@@ -2825,7 +2827,9 @@
 															listAll: true
 														},
 														success: function(json) {												  
-															var item = json.listpublicipaddressesresponse.publicipaddress[0];													
+															//var item = json.listpublicipaddressesresponse.publicipaddress[0];	//uncomment this line and delete the following line when "listPublicIpAddresses&id=N" is fixed to return a record.	
+                              var item = args.context.ipAddresses[0];
+													
 															args.context.ipAddresses.shift(); //remove the first element in args.context.ipAddresses										
 															args.context.ipAddresses.push(item);