Add -nowait option