Fix for message formatting