fix waveform order