Fix for message bag error