Timeout computation bug fixed