fix messages 2