Timeout handling fixed
0.4