fillMessage fix