Nurture track fix for wait and message