fix message function
Merge branch 'hotfix'