diff --git a/f90nml.py b/f90nml.py
index <HASH>..<HASH> 100644
--- a/f90nml.py
+++ b/f90nml.py
@@ -55,6 +55,11 @@ def read(nml_fname):
 
             if v_name:
 
+                # Pass commas
+                if t == ',':
+                    prior_t = t
+                    t = next(tokens)
+
                 #---
                 # Parse the prior token value
 
@@ -118,11 +123,6 @@ def read(nml_fname):
 
             print('{}: {}'.format(v_name, v_vals))
 
-            # Pass commas
-            if t == ',':
-                prior_t = t
-                t = next(tokens)
-
         # Append the grouplist to the namelist (including empty groups)
         nmls[g_name] = g_vars
Final element parsed; final comma bug; needs refactoring