diff --git a/LArCalorimeter/LArROD/python/LArNNChannelBuilder.py b/LArCalorimeter/LArROD/python/LArNNChannelBuilder.py
index 3604563ad3bcdcec32a14c1d4bfc342acf3d4d18..057c917d79037f3e1171fab657c6040d0ba81046 100644
--- a/LArCalorimeter/LArROD/python/LArNNChannelBuilder.py
+++ b/LArCalorimeter/LArROD/python/LArNNChannelBuilder.py
@@ -59,4 +59,4 @@ def LArNNRawChannelBuilderCfg(configFlags, name="LArNNRawChannelBuilder", **kwar
        
         acc.addEventAlgo(CompFactory.LArNNRawChannelBuilder(name, **kwargs))
 
-    return acc
\ No newline at end of file
+    return acc
diff --git a/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx b/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx
index 96951b1b24608e54d5d66b0313fab96a2cd6edc9..fec9ef6c03134bef7cc375e5a67ca22f4a053fe5 100644
--- a/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx
+++ b/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx
@@ -217,10 +217,10 @@ StatusCode LArRawChannelBuilderAlg::execute(const EventContext& ctx) const {
       double q=0;
       if (m_useShapeDer) {
 	const auto& fullshapeDer=shapes->ShapeDer(id,gain);
-	if (ATH_UNLIKELY(fullshapeDer.size()<nSamples+firstSample)) {
+	if (ATH_UNLIKELY(fullshapeDer.size()<nOFC+firstSample)) {
 	  ATH_MSG_ERROR("No valid shape derivative for channel " <<  m_onlineId->channel_name(id) 
 			<< " gain " << gain);
-	  ATH_MSG_ERROR("Got size " << fullshapeDer.size() << ", expected at least " << nSamples+firstSample);
+	  ATH_MSG_ERROR("Got size " << fullshapeDer.size() << ", expected at least " << nOFC+firstSample);
 	  return StatusCode::FAILURE;
 	}