diff --git a/wetb/hawc2/at_time_file.py b/wetb/hawc2/at_time_file.py
index 9dbc44409d464fb080ebfed1da7881b981dede28..3819ec2b37d0bf55d3aa7ff6e65ca258b2537fa6 100644
--- a/wetb/hawc2/at_time_file.py
+++ b/wetb/hawc2/at_time_file.py
@@ -49,11 +49,13 @@ class AtTimeFile(object):
         self.blade_radius = bladetip_radius
         with open(filename, encoding='utf-8') as fid:
             lines = fid.readlines()
-        self.attribute_names = lines[2].lower().replace("#", "").split()
-        data = np.array([[float(l) for l in lines[i].split() ] for i in range(3, len(lines))])
+        atttribute_name_line = [l.startswith("# Radius_s") for l in lines].index(True)
+        self.attribute_names = lines[atttribute_name_line].lower().replace("#", "").split()
+        data = np.array([[float(l) for l in lines[i].split() ] for i in range(atttribute_name_line+1, len(lines))])
         self.data = data
         def func_factory(column):
             def values(l=None, curved_length=False):
+                assert curved_length==True or curved_length==False, "Curved length must be boolean, but is %s"%curved_length
                 if l is None:
                     return self.data[:, column]
                 else: