fix bug for waps