Should we fix also the original messages?