Fixed the way Waveform handles Stimulus.