Fixed bug in MessageService