diff --git a/pycbc/strain/recalibrate.py b/pycbc/strain/recalibrate.py
index 304b955db94..bbbd71afed5 100644
--- a/pycbc/strain/recalibrate.py
+++ b/pycbc/strain/recalibrate.py
@@ -209,6 +209,7 @@ def set_spline(self, params=None, spline_index=None, **kwargs):
         """
         
         if params:
+            self.n_points = len(self.spline_points)
             self.params.update(**params)
             self.calibration_amplitude = \
                 [self.params['amplitude_{}_{}'.format(self.ifo_name, ii)] \
@@ -344,11 +345,9 @@ def calibration_optimal_snr(self, strain, psd = None,
         kmin, kmax = get_cutoff_indices(low_frequency_cutoff,
                                        high_frequency_cutoff,
                                         strain.delta_f, N)
-        ht = strain[kmin:kmax]
-        
-        ht_calib = self.apply_calibration(ht)
         
-        ht_calib = FrequencySeries(ht_calib.squeeze(), delta_f = ht.delta_f)
+        ht = strain[kmin:kmax]
+        ht_calib = self.apply_calibration(strain)[kmin:kmax]
 
         if psd:
             try:
@@ -704,4 +703,4 @@ def map_to_adjust(self, strain, **params):
                               kappa_tst_im=calib_args[5],
                               kappa_pu_re=calib_args[6],
                               kappa_pu_im=calib_args[7])
-        return strain_adjusted
+        return strain_adjusted
\ No newline at end of file