Edit for comment LC-2895