Fixed Waits
Fixed waits