Fix Comment issue