Fix non-unique message ID problem