#79 shortened wait when --wait = 0