Be able to cope with M999 causing a Resend: 1
(cherry picked from commit 8b702db)