diff --git a/rowers/models.py b/rowers/models.py
index d4af5780..221e11f9 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1378,12 +1378,20 @@ class Condition(models.Model):
         max_length=20, choices=conditionchoices, null=True)
 
     def __str__(self):
-        str = 'Condition: {metric} {condition} {value1} {value2}'.format(
+        str = 'Condition: {metric} {condition} {value1}'.format(
             metric=self.metric,
             condition=self.condition,
             value1 = self.value1,
-            value2 = self.value2,
         )
+        if self.condition == 'between':
+            str = 'Condition: {metric} between {value1} and {value2}'.format(
+                metric=self.metric,
+                condition=self.condition,
+                value1 = self.value1,
+                value2 = self.value2,
+            )
+
+
 
         return str