Merge pull request #3803 from diizzyy/patch-22