Add a retry to avoid timeout