Bug fix in messaging