Timeout fix 3