messages fix