Attempting to fix timeout