Waveform fix