yes you'll have to do those manually as part of the workaround. So make a little counter variable, check the counter before sending the retry message, and increment the counter on every subsequent attempt.