Trying to fix wait