diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
index 48bf385d04402f2f81f7f64cb7db8b0da809af4c..fda5de9c527c86aa5aba16173a5a138ae352ddde 100644
--- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
+++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
@@ -609,9 +609,9 @@ void surfaceNoise::calculate()
             // Determine frequency range of interest
             // Note: freqencies have fixed interval, and are in the range
             //       0 to fftWriteInterval_*(n-1)*deltaf
-            label f0 = ceil(fLower_/deltaf/fftWriteInterval_);
-            label f1 = floor(fUpper_/deltaf/fftWriteInterval_);
-            label nFreq = f0 == f1 ? 0 : f1 - f0 + 1;
+            label f0 = ceil(fLower_/deltaf/scalar(fftWriteInterval_));
+            label f1 = floor(fUpper_/deltaf/scalar(fftWriteInterval_));
+            label nFreq = f1 - f0;
 
             scalarField PrmsfAve(nFreq, 0);
             scalarField PSDfAve(nFreq, 0);
@@ -625,9 +625,9 @@ void surfaceNoise::calculate()
             }
             else
             {
-                for (label i = f0; i <= f1; ++i)
+                forAll(fOut, i)
                 {
-                    label freqI = i*fftWriteInterval_;
+                    label freqI = (i + f0)*fftWriteInterval_;
                     fOut[i] = freq1[freqI];
                     const word gName = "fft";