Finally fixed the issue with messages