Correction based on the comments