Timeout fix, and changed timeout to 60 seconds again for now.