bugfix in waveform method