ActionMessage fix