diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index ffa77b19504..a9cab55921c 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1648,36 +1648,40 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
 
 
     public void fullSync(final long clusterId, Map<String, Pair<String, State>> newStates, boolean init) {
+    	if (newStates==null)return;
         Map<Long, AgentVmInfo> infos = convertToInfos(newStates);
         Set<VMInstanceVO> set_vms = Collections.synchronizedSet(new HashSet<VMInstanceVO>());
         set_vms.addAll(_vmDao.listByClusterId(clusterId));
-        set_vms.addAll(_vmDao.listStartingByClusterId(clusterId));
+        set_vms.addAll(_vmDao.listLHByClusterId(clusterId));
 
         for (VMInstanceVO vm : set_vms) {
             if (vm.isRemoved() || vm.getState() == State.Destroyed  || vm.getState() == State.Expunging) continue;
             AgentVmInfo info =  infos.remove(vm.getId());
             if (init){ // mark the VMs real state on initial sync
                 VMInstanceVO castedVm = null;
-                if (info == null){
-                	if (vm.getState() == State.Running || vm.getState() == State.Starting) { // only work on VMs which were supposed to be starting/running earlier
-                        info = new AgentVmInfo(vm.getInstanceName(), getVmGuru(vm), vm, State.Stopped);
-                        castedVm = info.guru.findById(vm.getId());
-                        try {
-                            Host host = _hostDao.findByGuid(info.getHostUuid());
-                            long hostId = host == null ? (vm.getHostId() == null ? vm.getLastHostId() : vm.getHostId()) : host.getId();
-                            HypervisorGuru hvGuru = _hvGuruMgr.getGuru(castedVm.getHypervisorType());
-                            Command command = compareState(hostId, castedVm, info, true, hvGuru.trackVmHostChange());
-                            if (command != null){
-                                Answer answer = _agentMgr.send(hostId, command);
-                                if (!answer.getResult()) {
-                                    s_logger.warn("Failed to update state of the VM due to " + answer.getDetails());
-                                }
+                if ((info == null && (vm.getState() == State.Running || vm.getState() == State.Starting))  
+                		||  (info != null && (info.state == State.Running && vm.getState() == State.Starting))) 
+                {
+                	s_logger.info("Found vm " + vm.getInstanceName() + " in inconsistent state. " + vm.getState() + " on CS while " +  (info == null ? "Stopped" : "Running") + " on agent");
+                    info = new AgentVmInfo(vm.getInstanceName(), getVmGuru(vm), vm, State.Stopped);
+               		vm.setState(State.Running); // set it as running and let HA take care of it
+               		_vmDao.persist(vm);
+                    castedVm = info.guru.findById(vm.getId());
+                    try {
+                        Host host = _hostDao.findByGuid(info.getHostUuid());
+                        long hostId = host == null ? (vm.getHostId() == null ? vm.getLastHostId() : vm.getHostId()) : host.getId();
+                        HypervisorGuru hvGuru = _hvGuruMgr.getGuru(castedVm.getHypervisorType());
+                        Command command = compareState(hostId, castedVm, info, true, hvGuru.trackVmHostChange());
+                        if (command != null){
+                            Answer answer = _agentMgr.send(hostId, command);
+                            if (!answer.getResult()) {
+                                s_logger.warn("Failed to update state of the VM due to " + answer.getDetails());
                             }
-                        } catch (Exception e) {
-                            s_logger.warn("Unable to update state of the VM due to exception " + e.getMessage());
-                            e.printStackTrace();
                         }
-                	}
+                    } catch (Exception e) {
+                        s_logger.warn("Unable to update state of the VM due to exception " + e.getMessage());
+                        e.printStackTrace();
+                    }
                 }
            }
 
diff --git a/server/src/com/cloud/vm/dao/VMInstanceDao.java b/server/src/com/cloud/vm/dao/VMInstanceDao.java
index 68bd7eed8d4..984dea9833a 100644
--- a/server/src/com/cloud/vm/dao/VMInstanceDao.java
+++ b/server/src/com/cloud/vm/dao/VMInstanceDao.java
@@ -82,6 +82,6 @@ public interface VMInstanceDao extends GenericDao<VMInstanceVO, Long>, StateDao<
     public Long countAllocatedVirtualRoutersForAccount(long accountId);
 
     List<VMInstanceVO> listByClusterId(long clusterId);
-    List<VMInstanceVO> listStartingByClusterId(long clusterId);  // get all the VMs even starting one on this cluster
+    List<VMInstanceVO> listLHByClusterId(long clusterId);  // get all the VMs even starting one on this cluster
     List<VMInstanceVO> listVmsMigratingFromHost(Long hostId);
 }
diff --git a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
index 8d41e8bda1b..ba84765cd52 100644
--- a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -50,7 +50,7 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
     public static final Logger s_logger = Logger.getLogger(VMInstanceDaoImpl.class);
 
     protected final SearchBuilder<VMInstanceVO> VMClusterSearch;
-    protected final SearchBuilder<VMInstanceVO> StartingVMClusterSearch;
+    protected final SearchBuilder<VMInstanceVO> LHVMClusterSearch;
     protected final SearchBuilder<VMInstanceVO> IdStatesSearch;
     protected final SearchBuilder<VMInstanceVO> AllFieldsSearch;
     protected final SearchBuilder<VMInstanceVO> ZoneTemplateNonExpungedSearch;
@@ -79,12 +79,11 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
         hostSearch.and("clusterId", hostSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
         VMClusterSearch.done();
 
-        
-        StartingVMClusterSearch = createSearchBuilder();
+        LHVMClusterSearch = createSearchBuilder();
         SearchBuilder<HostVO> hostSearch1 = _hostDao.createSearchBuilder();
-        StartingVMClusterSearch.join("hostSearch1", hostSearch1, hostSearch1.entity().getId(), StartingVMClusterSearch.entity().getHostId(), JoinType.INNER);
+        LHVMClusterSearch.join("hostSearch1", hostSearch1, hostSearch1.entity().getId(), LHVMClusterSearch.entity().getLastHostId(), JoinType.INNER);
         hostSearch1.and("clusterId", hostSearch1.entity().getClusterId(), SearchCriteria.Op.EQ);
-        StartingVMClusterSearch.done();
+        LHVMClusterSearch.done();
 
         AllFieldsSearch = createSearchBuilder();
         AllFieldsSearch.and("host", AllFieldsSearch.entity().getHostId(), Op.EQ);
@@ -193,8 +192,8 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
     
 
     @Override
-    public List<VMInstanceVO> listStartingByClusterId(long clusterId) {
-        SearchCriteria<VMInstanceVO> sc = StartingVMClusterSearch.create();
+    public List<VMInstanceVO> listLHByClusterId(long clusterId) {
+        SearchCriteria<VMInstanceVO> sc = LHVMClusterSearch.create();
         sc.setJoinParameters("hostSearch1", "clusterId", clusterId);
         return listBy(sc);
     }