Merge pull request #3344 from Self-Perfection/patch-2