#6105

Updated the code.

Please check.