Fixed nwaveforms issue.