fixed message display error
Merge branch 'master' into hoyt