some fix for timeout