Possible fixes for timeout