=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2013-03-19 17:09:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2013-04-24 11:44:29 +0000
@@ -937,9 +937,10 @@
 
     public void setDoIndicators( boolean doIndicators )
     {
+        this.columnDimensions.remove( DATA_X_DIM_ID );
+        
         if ( doIndicators )
         {
-            this.columnDimensions.remove( DATA_X_DIM_ID );
             this.columnDimensions.add( DATA_X_DIM_ID );
         }
     }
@@ -951,9 +952,10 @@
 
     public void setDoPeriods( boolean doPeriods )
     {
+        this.columnDimensions.remove( PERIOD_DIM_ID );
+        
         if ( doPeriods )
         {
-            this.columnDimensions.remove( PERIOD_DIM_ID );
             this.columnDimensions.add( PERIOD_DIM_ID );
         }
     }
@@ -965,9 +967,10 @@
     
     public void setDoUnits( boolean doUnits )
     {
+        this.columnDimensions.remove( ORGUNIT_DIM_ID );
+        
         if ( doUnits )
         {
-            this.columnDimensions.remove( ORGUNIT_DIM_ID );
             this.columnDimensions.add( ORGUNIT_DIM_ID );
         }
     }