Updated initial timeout handling
Fixes