add fix for timeout code