Fix for create MessageSource object