wavemanager fixed