Tighten wait time, fix