Quick bug fix related to message formatting