#JC-1431:
* Fixed message duplication