Added retry option when a timeout happens