diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IResourceDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IResourceDAO.java
index b6a97564e..d21500d35 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IResourceDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IResourceDAO.java
@@ -26,6 +26,7 @@ import java.util.List;
 import org.navalplanner.business.common.daos.IGenericDAO;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.resources.entities.Criterion;
+import org.navalplanner.business.resources.entities.Machine;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.resources.entities.Worker;
 
@@ -43,6 +44,7 @@ public interface IResourceDAO extends IGenericDAO<Resource, Long> {
 
     public List<Worker> getVirtualWorkers();
 
+    public List<Machine> getMachines();
     /**
      * Returns all {@link Resource} which satisfy a set of {@link Criterion}
      */
@@ -51,4 +53,6 @@ public interface IResourceDAO extends IGenericDAO<Resource, Long> {
     List<Resource> findResourcesRelatedTo(List<Task> tasks);
 
     List<Resource> getResources();
+
+    List<Resource> getRealResources();
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java
index 3101b2d5b..d29e0f81a 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java
@@ -32,6 +32,7 @@ import org.hibernate.Query;
 import org.navalplanner.business.common.daos.GenericDAOHibernate;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.resources.entities.Criterion;
+import org.navalplanner.business.resources.entities.Machine;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.resources.entities.Worker;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -154,4 +155,17 @@ public class ResourceDAO extends GenericDAOHibernate<Resource, Long> implements
     public List<Resource> getResources() {
         return list(Resource.class);
     }
+
+    @Override
+    public List<Machine> getMachines() {
+        return list(Machine.class);
+    }
+
+    @Override
+    public List<Resource> getRealResources() {
+        List<Resource> list = new ArrayList<Resource>();
+        list.addAll(getRealWorkers());
+        list.addAll(getMachines());
+        return list;
+    }
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFinder.java
index 4b9136c93..57e44b3ba 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFinder.java
@@ -41,7 +41,7 @@ public class ResourceFinder extends Finder implements IFinder {
 
     @Transactional(readOnly = true)
     public List<Resource> getAll() {
-        return resourceDAO.getResources();
+        return resourceDAO.getRealResources();
     }
 
     @Override