Wave bug fix2