diff --git a/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciOrganization.pdl b/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciOrganization.pdl
index b2099a9e4..4a8502902 100644
--- a/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciOrganization.pdl
+++ b/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciOrganization.pdl
@@ -61,7 +61,7 @@ query getIdsOfDepartmentsOfSciOrganization {
         from ct_sciorga_organizations_departments_map        
         where ct_sciorga_organizations_departments_map.organization_id = :organization
     } map {
-        departmentId = ct_sciorga_organizations_departments_map;
+        departmentId = ct_sciorga_organizations_departments_map.department_id;
     }
 }
 
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganization.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganization.java
index 6e5062b83..acc097ebb 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganization.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganization.java
@@ -219,8 +219,8 @@ public class SciOrganization extends GenericOrganizationalUnit {
                           SessionManager.getSession().retrieveQuery(
                         "com.arsdigita.cms.contenttypes.getIdsOfDepartmentsOfSciOrganization");
                 departmentsQuery.setParameter("organization", getID());
-
-                if (query.size() > 0) {
+                                
+                if (departmentsQuery.size() > 0) {
                     BigDecimal departmentId;
                     boolean result = false;
                     while (departmentsQuery.next()) {