Fix wait