Updated with fixed MessagesRenderer.