#6590

Updated the code.

Please check.