Tweak To Make Message Proper and Consistent