Time out handeling improved