comment messages fix