diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
index a950926a515..1076089dcd6 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
@@ -434,13 +434,13 @@ public class MockStorageManagerImpl implements MockStorageManager {
 			List<MockVolumeVO> volumes = _mockVolumeDao.findByStorageIdAndType(storage.getId(),
 					MockVolumeType.VOLUME);
 
-			Map<String, TemplateInfo> templateInfos = new HashMap<String, TemplateInfo>();
+			Map<Long, TemplateInfo> templateInfos = new HashMap<Long, TemplateInfo>();
 			for (MockVolumeVO volume : volumes) {
-				templateInfos.put(volume.getName(), new TemplateInfo(volume.getName(), volume.getPath()
+				templateInfos.put(volume.getId(), new TemplateInfo(volume.getName(), volume.getPath()
 						.replaceAll(storage.getMountPoint(), ""), volume.getSize(), volume.getSize(), true, false));
 			}
 			txn.commit();
-			return new ListTemplateAnswer(cmd.getSecUrl(), templateInfos);
+			return new ListVolumeAnswer(cmd.getSecUrl(), templateInfos);
 		} catch (Exception ex) {
 			txn.rollback();
 			throw new CloudRuntimeException("Error when finding template on sec storage " + storage.getId(), ex);