Bugfix of message macros