Fix timeout pt2