Fix 2 with new messages