Fixed bug in DefaultMessageProvider