Fix bug where things occaisonally were not being timed out correctly.