Changed default timeout to infinite