fix the comments broadcasting issue