diff --git a/application/controllers/monpas/Rapmatrix.php b/application/controllers/monpas/Rapmatrix.php
index 7b68362..70bb60d 100644
--- a/application/controllers/monpas/Rapmatrix.php
+++ b/application/controllers/monpas/Rapmatrix.php
@@ -387,16 +387,19 @@ private function getGemiddeldenSchool($labels, $aantalY, $orgversieID, $kleuren)
                             $aantalrijen = $aantalrijen + 1;
                             for ($i = 0; $i < $aantalY; $i++) {
                                 if(isset($user->scores[$i])) {
+                                    if($user->scores[$i]->disabled == 'F' && $user->scores[$i]->disablenvt == 'F') {
 //                                    if ($user->scores[$i]->gem == '' || $user->scores[$i]->gem == null) {
 //                                        // doe niks
 //                                    } else {
                                         $aantalscores++;
                                         $sumscore[$i] = $sumscore[$i] + $user->scores[$i]->gem;
                                         $aantalresults[$i] = $aantalresults[$i] + 1;
+
                                         $sumscorerij = $sumscorerij + $user->scores[$i]->gem;
                                         if ($sumscorerij > 0) {
                                             $waarden++;
                                         }
+                                    }
 //                                    }
 
                                     $user->scores[$i]->kleur = $this->getkleur($user->scores[$i]->gem, $kleuren);
@@ -624,6 +627,10 @@ private function getGemiddeldeScores($labels, $aantalY, $kleuren){
                         $aantalrijen = $aantalrijen + 1;
                         for ($i = 0; $i < $aantalY; $i++) {
                             if(isset($user->scores[$i])) {
+                                if($user->scores[$i]->disabled == 'F' &&
+                                    ($user->scores[$i]->aantalvier == 0 ||
+                                        ($user->scores[$i]->aantalvier > 0 &&
+                                            $user->scores[$i]->aantalnvt != $user->scores[$i]->aantalvier ))){
 //                                if ($user->scores[$i]->gem == '' || $user->scores[$i]->gem == null) {
 //                                    // doe niks
 //                                } else {
@@ -634,6 +641,7 @@ private function getGemiddeldeScores($labels, $aantalY, $kleuren){
                                     if ($sumscorerij > 0) {
                                         $waarden++;
 //                                    }
+                                    }
                                 }
                                 $user->scores[$i]->kleur = $this->getkleur($user->scores[$i]->gem, $kleuren);
                             }