Fix for the message library