Fixed message id generation
Fixed message id generation