diff --git a/sections/cper-section-memory.c b/sections/cper-section-memory.c
index 95eac67..a3b76b6 100644
--- a/sections/cper-section-memory.c
+++ b/sections/cper-section-memory.c
@@ -82,7 +82,6 @@
 			*desc_string);
 	}
 	//"Extended" row/column indication field + misc.
-	// Review this
 	if (isvalid_prop_to_ir(&ui64Type, 18)) {
 		json_object *extended = json_object_new_object();
 		json_object_object_add(
@@ -99,20 +98,17 @@
 						    5));
 		}
 		json_object_object_add(section_ir, "extended", extended);
+	}
 
-		//bit 16 and 17 are valid only if extended is valid
-		if (isvalid_prop_to_ir(&ui64Type, 16)) {
-			json_object_object_add(
-				section_ir, "cardSmbiosHandle",
-				json_object_new_uint64(
-					memory_error->CardHandle));
-		}
-		if (isvalid_prop_to_ir(&ui64Type, 17)) {
-			json_object_object_add(
-				section_ir, "moduleSmbiosHandle",
-				json_object_new_uint64(
-					memory_error->ModuleHandle));
-		}
+	if (isvalid_prop_to_ir(&ui64Type, 16)) {
+		json_object_object_add(
+			section_ir, "cardSmbiosHandle",
+			json_object_new_uint64(memory_error->CardHandle));
+	}
+	if (isvalid_prop_to_ir(&ui64Type, 17)) {
+		json_object_object_add(
+			section_ir, "moduleSmbiosHandle",
+			json_object_new_uint64(memory_error->ModuleHandle));
 	}
 
 	//Miscellaneous numeric fields.