Timeout should be more robust now, removed infinite blocking