Still trying to fix TIMEOUT