Add better overflow safety in resend