Merge pull request #6031 from nabinhait/patch_fix_9

[fix]Patch order changed. Fixed #6026