diff --git a/tupak/gw/waveform_generator.py b/tupak/gw/waveform_generator.py
index 3306e883838d81fb03a6e8158513441ec7c00744..b0aef610cbd598c3479b2f361e79f9ccb6f08db3 100644
--- a/tupak/gw/waveform_generator.py
+++ b/tupak/gw/waveform_generator.py
@@ -94,15 +94,15 @@ class WaveformGenerator(object):
     @property
     def frequency_array(self):
         if self.__frequency_array_updated is False:
-            self.__frequency_array = utils.create_frequency_series(
+            self.frequency_array = utils.create_frequency_series(
                                         self.sampling_frequency,
                                         self.time_duration)
-            self.__frequency_array_updated = True
         return self.__frequency_array
 
     @frequency_array.setter
     def frequency_array(self, frequency_array):
         self.__frequency_array = frequency_array
+        self.__frequency_array_updated = True
 
     @property
     def time_array(self):