changed timeout value back to non-infinity