No more timeout - CC'ing #129