Fix handling of timeouts.