#569 Correctly resend failed commands (instead of just updating)