AppMessage fix