Fix in MessageService for sl