diff --git a/src/liquivision_lynx_parser.c b/src/liquivision_lynx_parser.c
index 8489a50..ca41e21 100644
--- a/src/liquivision_lynx_parser.c
+++ b/src/liquivision_lynx_parser.c
@@ -333,7 +333,7 @@ liquivision_lynx_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callba
 	// Get the sample interval.
 	unsigned int interval_idx = data[39];
 	const unsigned int intervals[] = {1, 2, 5, 10, 30, 60};
-	if (interval_idx > C_ARRAY_SIZE(intervals)) {
+	if (interval_idx >= C_ARRAY_SIZE(intervals)) {
 		ERROR (abstract->context, "Invalid sample interval index %u", interval_idx);
 		return DC_STATUS_DATAFORMAT;
 	}
diff --git a/src/mares_iconhd_parser.c b/src/mares_iconhd_parser.c
index a76ca20..5d35bea 100644
--- a/src/mares_iconhd_parser.c
+++ b/src/mares_iconhd_parser.c
@@ -76,8 +76,8 @@
 #define GASMIX_INUSE 2
 #define GASMIX_IGNRD 3
 
-#define WATER_SALT    0
-#define WATER_FRESH   1
+#define WATER_FRESH   0
+#define WATER_SALT    1
 #define WATER_EN13319 2
 
 #define ALARM_NONE                 0