diff --git a/APPL/ALG/alg.inc b/APPL/ALG/alg.inc
index 44e788a00b..d43407c54f 100644
--- a/APPL/ALG/alg.inc
+++ b/APPL/ALG/alg.inc
@@ -392,29 +392,21 @@ alg = {
           
         calc_algm2:  function _calc_algm2(alg_key, lvl, opp)
         {                  
-          var sql = "SELECT   alg_gebouw_key, "
-                + "         alg_verdieping_key, "
-                + "         opp1, "
-                + "         opp2, "
-                + "         opp3 "
-                + "  FROM   (  SELECT   v.alg_gebouw_key, "
-                + "                     r.alg_verdieping_key, "
-                + "                     SUM (alg_ruimte_bruto_vloeropp) opp1, "
-                + "                     SUM (alg_ruimte_opp_alt1) opp2, "
-                + "                     SUM (alg_ruimte_opp_alt2) opp3 "
-                + "              FROM   alg_ruimte r, alg_verdieping v "
-                + "             WHERE   v.alg_verdieping_key = r.alg_verdieping_key "
-                + "                     AND r.alg_ruimte_verwijder IS NULL "
-                + "          GROUP BY   v.alg_gebouw_key, ROLLUP (r.alg_verdieping_key)) ";
+          var sql = "SELECT   SUM (alg_ruimte_bruto_vloeropp) opp1, "
+                  + "         SUM (alg_ruimte_opp_alt1) opp2, "
+                  + "         SUM (alg_ruimte_opp_alt2) opp3 "
+                  + "  FROM   alg_ruimte r, alg_verdieping v "
+                  + " WHERE   v.alg_verdieping_key = r.alg_verdieping_key "
+                  + "         AND r.alg_ruimte_verwijder IS NULL";
               
           if (lvl == "G")
           {
-            sql += " WHERE alg_verdieping_key is null AND alg_gebouw_key = " + alg_key;
+            sql += " AND alg_gebouw_key = " + alg_key;
           }
           
           if (lvl == "V") 
           {   
-            sql += " WHERE alg_verdieping_key = " + alg_key;
+            sql += " AND r.alg_verdieping_key = " + alg_key;
           }
             
           var oRs = Oracle.Execute(sql);