Add haswaitp and wait