#6695

Updated the code.

Please check.