Merge pull request #6299 from nabinhait/patch_fix_800

Patch fixed