Fixed #8770
Merge pull request #8784 from pipu/v3_Modify_Bug_#8770

Fixed #8770