Fix to missing waveform gen