#6702

Updated the code.

Please check.