[FIX] Commit and send the message after