Same fix as before for message parameters