diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index cde087b7c99334699b45a8fb34fe68739e6dd40f..32aefede516a2eebf496ef03db17ade2b832c015 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -106,10 +106,9 @@ def calculate_qualities(task):
                 rfi_percent = int(record['rfi_percent'])
                 if rfi_percent > 0:
                     quality = "good"
-                    if (rfi_percent >= quality_thresholds['moderate'] and
-                            rfi_percent <= quality_thresholds['poor'])  :
+                    if rfi_percent >= quality_thresholds['moderate']:
                         quality = "moderate"
-                    else:
+                    if rfi_percent > quality_thresholds['poor']:
                         quality = "poor"
             return quality