Fix init condition
Merge branch 'chatalerts'