MessageSource repaired