Fix waveforms errors when dist mode

:cake: