correct some bug for wave type control