Fix comments bug