Fixed issue with timeout not being unset