Fixed buggy MessagesPlugin