Fixed overriding default message sources