Change hardcoded timeout to infinity