Final fix for timeout