Changed handling of timeouts.