diff --git a/rowers/tasks.py b/rowers/tasks.py
index 67d9ee86..420594bd 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -619,10 +619,10 @@ def handle_calctrimp(id,
         normw = 0
         
 
-    if np.isnan(normv):
+    if not np.isfinite(normv):
         normv = 500./120.
 
-    if np.isnan(normw):
+    if not np.isfinite(normw):
         normw = 0
     
     query = 'UPDATE rowers_workout SET rscore = {tss}, normp = {normp}, trimp={trimp}, hrtss={hrtss}, normv={normv}, normw={normw} WHERE id={id}'.format(