diff --git a/src/ipa/simple/algorithms/ccm.cpp b/src/ipa/simple/algorithms/ccm.cpp
index 0a98406c..d7d3dda7 100644
--- a/src/ipa/simple/algorithms/ccm.cpp
+++ b/src/ipa/simple/algorithms/ccm.cpp
@@ -94,7 +94,7 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,
 	if (frame > 0 &&
 	    utils::abs_diff(ct, lastCt_) < kTemperatureThreshold &&
 	    saturation == lastSaturation_) {
-		frameContext.ccm.ccm = context.activeState.ccm.ccm;
+		frameContext.ccm = context.activeState.ccm.ccm;
 		context.activeState.ccm.changed = false;
 		return;
 	}
@@ -106,9 +106,9 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,
 		applySaturation(ccm, saturation.value());
 
 	context.activeState.ccm.ccm = ccm;
-	frameContext.ccm.ccm = ccm;
 	frameContext.saturation = saturation;
 	context.activeState.ccm.changed = true;
+	frameContext.ccm = ccm;
 }
 
 void Ccm::process([[maybe_unused]] IPAContext &context,
@@ -117,7 +117,7 @@ void Ccm::process([[maybe_unused]] IPAContext &context,
 		  [[maybe_unused]] const SwIspStats *stats,
 		  ControlList &metadata)
 {
-	metadata.set(controls::ColourCorrectionMatrix, frameContext.ccm.ccm.data());
+	metadata.set(controls::ColourCorrectionMatrix, frameContext.ccm.data());
 
 	const auto &saturation = frameContext.saturation;
 	metadata.set(controls::Saturation, saturation.value_or(1.0));
diff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h
index 26db92e9..74e77c84 100644
--- a/src/ipa/simple/ipa_context.h
+++ b/src/ipa/simple/ipa_context.h
@@ -75,9 +75,7 @@ struct IPAActiveState {
 };
 
 struct IPAFrameContext : public FrameContext {
-	struct {
-		Matrix<float, 3, 3> ccm;
-	} ccm;
+	Matrix<float, 3, 3> ccm;
 
 	struct {
 		int32_t exposure;