Fix for timeout