Try a better timeout handling