Fix comments  for feature request #2321