Fix recursion ping bug
Merge branch 'chatalerts'