Fixed for wavez