diff --git a/server/src/com/cloud/api/commands/ListVolumesCmd.java b/server/src/com/cloud/api/commands/ListVolumesCmd.java
index 006f1565ca2..29959ba3935 100755
--- a/server/src/com/cloud/api/commands/ListVolumesCmd.java
+++ b/server/src/com/cloud/api/commands/ListVolumesCmd.java
@@ -131,9 +131,9 @@ public class ListVolumesCmd extends BaseCmd{
         } else {
             c.addCriteria(Criteria.ID, id);
             c.addCriteria(Criteria.INSTANCEID, vmId);
-            c.addCriteria(Criteria.NAME, name);
-            if (isAdmin) {
-                c.addCriteria(Criteria.VTYPE, type);
+            c.addCriteria(Criteria.NAME, name);
+            c.addCriteria(Criteria.VTYPE, type);
+            if (isAdmin) {                
                 c.addCriteria(Criteria.DATACENTERID, zoneId);
                 c.addCriteria(Criteria.PODID, podId);
                 c.addCriteria(Criteria.HOSTID, hostId);