Fix bug where timeouts would not be detected