Corrected 0 timeout case
Code clean