removed timeout hack