Trying to fix timeout