diff --git a/lib/calib_yacc.y b/lib/calib_yacc.y
index cd4e299..1e1bf5d 100644
--- a/lib/calib_yacc.y
+++ b/lib/calib_yacc.y
@@ -246,7 +246,7 @@ extern struct calibration_file_contents* parse_calibration_file( FILE *file )
 		;
 
 	calibration_setting: /* empty */ { cal_index++; }
-		| calibration_setting_element
+		| calibration_setting_element { cal_index++; }
 		| calibration_setting_element ',' calibration_setting
 		;
 
@@ -293,7 +293,7 @@ extern struct calibration_file_contents* parse_calibration_file( FILE *file )
 		;
 
 	caldac: /* empty */ { add_caldac( parsed_file, caldac ); }
-		| caldac_element
+		| caldac_element { add_caldac( parsed_file, caldac ); }
 		| caldac_element ',' caldac
 		;