Fix comments collection