diff --git a/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index c96f76aee8f..5299cc38638 100755
--- a/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -255,7 +255,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
 		public Long getUsedCapacity() {
 			return sumUsed;
 		}
-		public long getSumReserved() {
+		public long getReservedCapacity() {
 			return sumReserved;
 		}
 		public Long getTotalCapacity() {
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index a70a68b20dd..9257bdb579b 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -2481,8 +2481,12 @@ public class ManagementServerImpl implements ManagementServer {
 
         for (SummedCapacity summedCapacity : summedCapacities){
         	CapacityVO capacity = new CapacityVO(null, zoneId, podId, clusterId,
-        			summedCapacity.getUsedCapacity(), summedCapacity.getTotalCapacity(), summedCapacity.getCapacityType());
-
+        			summedCapacity.getUsedCapacity() + summedCapacity.getReservedCapacity(), 
+        			summedCapacity.getTotalCapacity(), summedCapacity.getCapacityType());
+        	
+        	if (capacityType == Capacity.CAPACITY_TYPE_CPU){
+        		capacity.setTotalCapacity((long)(summedCapacity.getTotalCapacity() * ApiDBUtils.getCpuOverprovisioningFactor()));
+        	}
         	capacities.add(capacity);		
         }