diff --git a/src/descriptor.c b/src/descriptor.c
index df30202..18c8d77 100644
--- a/src/descriptor.c
+++ b/src/descriptor.c
@@ -238,7 +238,7 @@ static const dc_descriptor_t g_descriptors[] = {
 	/* Shearwater Petrel */
 	{"Shearwater", "Petrel",   DC_FAMILY_SHEARWATER_PETREL, 3},
 	{"Shearwater", "Petrel 2", DC_FAMILY_SHEARWATER_PETREL, 3},
-	{"Shearwater", "Nerd", DC_FAMILY_SHEARWATER_PETREL, 3},
+	{"Shearwater", "Nerd",     DC_FAMILY_SHEARWATER_PETREL, 3},
 	/* Dive Rite NiTek Q */
 	{"Dive Rite", "NiTek Q",   DC_FAMILY_DIVERITE_NITEKQ, 0},
 	/* Citizen Hyper Aqualand */
diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c
index 4b03bbe..42f37da 100644
--- a/src/oceanic_atom2_parser.c
+++ b/src/oceanic_atom2_parser.c
@@ -735,6 +735,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
 			// bytes 6 & 7 encode minutes of NDL / deco
 			if (parser->model == A300CS || parser->model == VTX) {
 				unsigned int deco = (data[offset + 15] & 0x70) >> 4;
+				unsigned int decotime = array_uint16_le(data + offset + 6) & 0x03FF;
 				if (deco) {
 					sample.deco.type = DC_DECO_DECOSTOP;
 					sample.deco.depth = deco * 10 * FEET;
@@ -742,7 +743,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
 					sample.deco.type = DC_DECO_NDL;
 					sample.deco.depth = 0.0;
 				}
-				sample.deco.time = array_uint16_le(data + offset + 6) & 0x03FF;
+				sample.deco.time = decotime * 60;
 				if (callback) callback (DC_SAMPLE_DECO, sample, userdata);
 			}