Correctly handle adding timeouts