Changed SHORT_TIMEOUT to TIMEOUT