diff --git a/pykat/detectors.py b/pykat/detectors.py
index 6e2f4090578e554ec63470e81b6f9562cee39300..bc9c0dd7a4fac22a27649406fd3aa167d04c4f04 100644
--- a/pykat/detectors.py
+++ b/pykat/detectors.py
@@ -213,12 +213,12 @@ class pd(Detector):
             demods = int(values[0][3])
         elif len(values[0]) == 3:
             demods = int(values[0][2])
-        elif len(values[0] != 2):
+        elif len(values[0]) != 2:
             raise pkex.BasePyKatException("Photodiode code format incorrect '{0}'".format(text))
         
         if len(values) <= 3 and demods > 0:
             raise pkex.BasePyKatException("Photodiode code format incorrect '{0}'".format(text))
-        elif len(values) >= 3 and demods == 0:
+        elif len(values) > 3 and demods == 0:
             raise pkex.BasePyKatException("Photodiode code format incorrect '{0}'".format(text))
             
         num_f_phs = len(values) - 3