* Modify S6327: Improve the recommended fix * Apply suggestions from code review * add more info * improvement