Message Provider Fix